fix:"子账号开放结算账号功能"

src/main.js

@@ -5,7 +5,7 @@ import {
   PullRefresh, List, Tab, Tabs, SubmitBar, Toast, Skeleton, RadioGroup, Radio, NoticeBar, ActionSheet, Cascader, Col, Row,
   Slider, DatePicker, Switch, Calendar, Picker, Uploader, Tag, DropdownMenu, DropdownItem, Notify, ConfigProvider, NavBar,
   Area, Popover, Collapse, CollapseItem, PickerGroup, TimePicker, BackTop, Progress, Tabbar, TabbarItem, Search, FloatingBubble,
-  TextEllipsis
+  TextEllipsis, Step, Steps
 } from 'vant';
 import { Image as VanImage } from 'vant';
 import App from './App.vue'
@@ -94,6 +94,8 @@ app.use(ActionBarButton)
   .use(Search)
   .use(FloatingBubble)
   .use(TextEllipsis)
+  .use(Step)
+  .use(Steps)
 
 app.use(router)
 app.use(store)

src/views/accountPer/add.vue

@@ -5,9 +5,8 @@
     <div class="accountPerBox flex-col">
       <van-form @submit="onSubmit">
         <van-field v-model="username" name="username" :label="$t('accountPer.usernameLabel')" :readonly="isUserName"
-          :placeholder="$t('accountPer.usernamePlaceholder')" :rules="[
-            { required: true, message: $t('accountPer.usernamePlaceholder') },
-          ]" />
+          :placeholder="$t('accountPer.usernamePlaceholder')" 
+          :rules="[{ pattern: /^[a-zA-Z][a-zA-Z0-9]*$/, message: $t('register.usernameRequired') }]" />
         <van-field v-model="password" name="password" type="password" :label="$t('accountPer.passwordLabel')"
           :placeholder="passwordPlaceholder" :rules="[
             { required: havePassword, message: $t('accountPer.passwordPlaceholder') },

src/views/device/doSugar.vue

@@ -25,7 +25,7 @@
           <span @click="pushToDaySugarList">{{ $t('device.todaysSugarList') }}>></span>
         </div>
         <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
-          $t('device.submitToMakeSugar') }}</span></div>
+      $t('device.submitToMakeSugar') }}</span></div>
         <van-button v-if="doSugartData" style="padding: 1em;" round type="primary" class="block5 flex-col"
           :disabled="doSugartType" @click="checkData()">{{ $t('device.viewResults') }}</van-button>
       </div>
@@ -47,7 +47,7 @@
           <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>
+      $t('device.submitToMakeSugar') }}</span></div>
         <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
           @click="checkData()">{{ $t('device.viewResults') }}</van-button>
       </div>
@@ -64,12 +64,12 @@
               </div>
             </template>
           </van-cascader>
-        </van-popup>
+        </van-popup> -->
         <div class="textRow o-pr-20">
           <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>
+      $t('device.submitToMakeSugar') }}</span></div>
         <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
           @click="checkData()">{{ $t('device.viewResults') }}</van-button>
       </div>
@@ -98,9 +98,9 @@ export default {
     const cascaderValue = ref('');
     const options = ref([]);
     const onFinish = ({ selectedOptions }) => {
+      console.log('onFinish', selectedOptions);
       show.value = false;
       fieldValue.value = selectedOptions[0].value
-      console.log('onFinish', selectedOptions[0].value);
     }
     const doSugartData = ref(null);
     const doSugartType = ref(true);
@@ -127,7 +127,7 @@ export default {
     const getProduct = async () => {
       const { data } = await selectProducts({ equipmentId: deviceId });
       if (data.code) {
-        if(machineType != '2') {
+        if (machineType != '2') {
           options.value = data.data.map(item => {
             return {
               text: item.productName,
@@ -156,7 +156,11 @@ export default {
                   children: []
                 }
               )
-            } else if (item.no.includes('J')) {
+            }
+          })
+
+          data.data.forEach(item => {
+            if (item.no.includes('J')) {
               options.value[0].children.push(
                 {
                   text: item.productName,
@@ -165,7 +169,11 @@ export default {
                   children: [],
                 }
               )
-            } else if (item.no.includes('C')) {
+            }
+          })
+
+          data.data.forEach(item => {
+            if (item.no.includes('C')) {
               options.value[0].children.forEach(item1 => {
                 item1.children.push(
                   {
@@ -179,7 +187,7 @@ export default {
           })
         }
       } else { showFailToast(data.message); }
-      console.log(options.value);
+      // console.log(options.value);
     }
     const submitDoSugar = async () => {
       doSugartData.value = null;

src/views/settlement/index.vue

@@ -701,6 +701,7 @@ export default {
         addParams.idCardNo = data.data.idCardNo;
         if (data.data.idCardExpiry) {
           addParams.idCardExpiry = dateUtil.formateDate(new Date(data.data.idCardExpiry), "yyyy-MM-dd");
+          addParams.beginDate = dateUtil.formateDate(new Date(data.data.idCardExpiry), "yyyy-MM-dd");
         }
 
         addParams.bankAccountType = data.data.bankAccountType ? data.data.bankAccountType.toString() : '';

src/views/user.vue

@@ -235,7 +235,7 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland && user.type == '2'" class="taskListRow l-flex-RC" @click="pushPageList('/settlement')">
+          <div v-if="isInland && (user.type == 2 || user.type == 3)" class="taskListRow l-flex-RC" @click="pushPageList('/settlement')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
@@ -330,7 +330,7 @@
     <!-- 国家选择弹窗 -->
     <van-popup v-model:show="showCountry" round position="bottom">
       <van-cascader :title="$t('register.chooseCountryCity')" :options="countryOptions" @close="showCountry = false"
-        @finish="onConfirmCountry" >
+        @finish="onConfirmCountry">
         <template #options-top="{ tabIndex }">
           <van-search v-if="tabIndex === 0" v-model="searchValue" class="searchCity"
             :placeholder="$t('kSelectPop.searchKey')" @update:model-value="valueChange(tabIndex)" />