Merge branch 'sunzee-test' into sunzee-test-chatbot

src/assets/language/zh.json

@@ -1391,12 +1391,14 @@
     "airwallex": "空中云汇",
     "currencySymbol": "自定义货币",
     "currencySymbolPlace": "请输入自定义货币",
+    "diyPassword": "DIY使用密码",
+    "diyPasswordPlace": "请输入DIY使用密码",
     "szPayType": "申泽支付平台",
     "scPayType": "七云支付平台",
     "currentChoose": "当前选择",
     "tips": "提醒",
     "changeTips": "是否切换支付平台？",
-    "changeSuccess": "切换成功"
+    "changeSuccess": "修改成功"
   },
   "bindWechat": {
     "cancel": "取消",

src/service/user.js

@@ -35,4 +35,8 @@ export function updatePayPlatform(params) {
 // 添加公告
 export function addNotice(params) {
   return axios.post(`/SZWL-SERVER/tNotice/addNotice`, params);
-}
+}
+// 修改DIY功能使用密码
+export function updateDIYPassword(params) {
+  return axios.get(`/SZWL-SERVER/tEquipment/updateDIYPassword?${stringToUrl(params)}`, params);
+} 

src/views/advertManage/adSet.vue

@@ -191,6 +191,22 @@ export default {
         name: "P30en",
         id: "P30en",
       },
+      {
+        name: "SI320",
+        id: "SI320",
+      },
+      {
+        name: "SI320en",
+        id: "SI320en",
+      },
+      {
+        name: "SBC320",
+        id: "SBC320",
+      },
+      {
+        name: "SBC320en",
+        id: "SBC320en",
+      },
     ]);
     const busiPopFieldName = reactive({
       text: "name",

src/views/apkManage/add.vue

@@ -215,7 +215,19 @@ export default {
       {
         name: "SI320en",
         id: "SI320en",
-      }
+      },
+      {
+        name: "SBC320ch",
+        id: "SBC320ch",
+      },
+      {
+        name: "SBC320en",
+        id: "SBC320en",
+      },
+      {
+        name: "lua",
+        id: "lua",
+      },
     ]);
     const busiPopFieldName = reactive({
       text: "name",

src/views/user.vue

@@ -36,9 +36,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>
@@ -59,6 +59,7 @@
               <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
               <div>
                 <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
+
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
                     </van-button>
@@ -85,7 +86,9 @@
             <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,9 +133,10 @@
             <div>
               <van-field class="relationClass" v-model="cofficentForm.currencySymbol"
                 :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>
@@ -144,6 +148,27 @@
             <span>{{ accountDetail.currencySymbol }}</span>
             <van-icon name="edit" class="editIcon" @click="editClk(5)" />
           </div>
+          <div v-if="user.type == '0'">
+            <div v-if="!diyPasswordShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.diyPassword") }}: </span>
+              <div>
+                <van-field class="relationClass" v-model="diyPassword" :placeholder="$t('user.diyPasswordPlace')">
+  
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(diyPassword, 6)">{{
+          $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.diyPassword") }}: </span>
+              <!-- <span>{{ accountDetail.currencySymbol }}</span> -->
+              <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+            </div>
+          </div>
 
           <!-- 切换支付平台 -->
           <div v-if="chaSzPayShow" class="userInfo l-flex-between">
@@ -266,7 +291,7 @@
 
           <!-- 意见反馈 -->
           <div v-if="user.type > 1" class="taskListRow flex-col" @click="pushPageList('/feedback')">
-          <!-- <div v-if="user.id == 31 || user.id == 34" class="taskListRow flex-col" @click="pushPageList('/feedback')"> -->
+            <!-- <div v-if="user.id == 31 || user.id == 34" class="taskListRow flex-col" @click="pushPageList('/feedback')"> -->
             <div class="taskIcon feedbackIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.feedback") }}</div>
@@ -319,7 +344,7 @@ import {
   $M_PhoneTest,
 } from "@/common/js/utils";
 import { useRouter } from "vue-router";
-import { tAdminGetRelation, updatePayPlatform } from "@/service/user";
+import { tAdminGetRelation, updatePayPlatform, updateDIYPassword } from "@/service/user";
 // import { tAdminGetRelation, tAdminSetRelationAdmin, updatePayPlatform } from "@/service/user";
 import { showFailToast, showToast, showSuccessToast, showConfirmDialog } from 'vant';
 import { useI18n } from "vue-i18n";
@@ -340,10 +365,13 @@ export default {
     const mailboxShow = ref(true);
     // 控制货币显示隐藏 货币符号，默认“￥”
     const symbolShow = ref(true);
+    // 控制DIY使用密码显示隐藏
+    const diyPasswordShow = ref(true);
     // 控制切换支付平台按钮显示隐藏
     const chaSzPayShow = ref(false);
     const chaScPayShow = ref(false);
 
+    const diyPassword = ref("");
 
     const sunzeePay = ref(false);
     const sevencloudPay = ref(false);
@@ -377,6 +405,7 @@ export default {
           phoneNumberShow.value = true;
           areaShow.value = true;
           symbolShow.value = true;
+          diyPasswordShow.value = true;
           break;
         case 2:
           cofficentForm.mailBox = accountDetail.value.email;
@@ -385,6 +414,7 @@ export default {
           phoneNumberShow.value = true;
           areaShow.value = true;
           symbolShow.value = true;
+          diyPasswordShow.value = true;
           break;
         case 3:
           cofficentForm.phone = accountDetail.value.phone;
@@ -393,6 +423,7 @@ export default {
           phoneNumberShow.value = !phoneNumberShow.value;
           areaShow.value = true;
           symbolShow.value = true;
+          diyPasswordShow.value = true;
           break;
         case 4:
           cofficentForm.area = accountDetail.value.area;
@@ -401,6 +432,7 @@ export default {
           phoneNumberShow.value = true;
           areaShow.value = !areaShow.value;
           symbolShow.value = true;
+          diyPasswordShow.value = true;
           break;
         case 5:
           cofficentForm.currencySymbol = accountDetail.value.currencySymbol;
@@ -409,6 +441,16 @@ export default {
           phoneNumberShow.value = true;
           areaShow.value = true;
           symbolShow.value = !symbolShow.value;
+          diyPasswordShow.value = true;
+          break;
+        case 6:
+          cofficentForm.currencySymbol = accountDetail.value.currencySymbol;
+          relationType.value = true;
+          mailboxShow.value = true;
+          phoneNumberShow.value = true;
+          areaShow.value = true;
+          symbolShow.value = true;
+          diyPasswordShow.value = !diyPasswordShow.value;
           break;
       }
     };
@@ -489,7 +531,24 @@ export default {
               localStorage.setItem("loginUser", JSON.stringify(user));
               setTimeout(() => {
                 getAcccountDetail();
-              }, 500);
+              }, 1000);
+            }
+          }
+          break;
+        case 6:
+          if (!e) {
+            showToast(t("user.diyPasswordPlace"));
+          } else {
+            const params = {
+              diyPassword: e,
+            };
+            const { data } = await updateDIYPassword(params);
+            diyPasswordShow.value = true;
+            if (data.code === "00000") {
+              showToast(t("user.changeSuccess"));
+              setTimeout(() => {
+                getAcccountDetail();
+              }, 1000);
             }
           }
           break;
@@ -764,6 +823,8 @@ export default {
       symbolShow,
       chaSzPayShow,
       chaScPayShow,
+      diyPasswordShow,
+      diyPassword,
       sunzeePay,
       sevencloudPay,
       changeSunzeePay,