Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -36,7 +36,7 @@
                             </Field>
                         </template>
                         <template v-else-if="(item.fieldcode === 'bank_branch_name')">
-                            <Field v-if="showExtendInfo(item)" name="OpenBankName" :label="item.fieldname"
+                            <Field v-if="showExtendInfo(item)" name="OpenBankName" :label="$t('banksign.branchbankname')"
                                 v-model="item.value" maxlength="100" right-icon="search"
                                 :placeholder="$t('common.pleaseenter') + `${item.fieldname}`"
                                 :rules="formRules.OpenBankName" @click-right-icon="showSearch = true" />

src/packages/mobile/views/order/position/components/pricing/detail2/Index.vue

@@ -64,7 +64,7 @@
                         </div>
                         <div class="g-order-list__btnbar" v-if="item.tHDetailEx.holderQty">
                             <Button size="small" v-if="enableqty(item) != 0 && !onlyDelivery" @click="showComponent('close', item)" round>{{ $t('operation.close') }}</Button>
-                            <Button size="small" v-if="deliveryflag(item) != 0" @click="showComponent('delivery', item)" round>{{ $t('operation.delivery') }}</Button>
+                            <Button size="small" v-if="deliveryflag(item) != 0" @click="showComponent('delivery', item)" round>{{ item.tHDetailEx.buyOrSell === 0 ? $t('operation.pickup') : $t('operation.delivery') }}</Button>
                         </div>
                     </div>
                 </div>

src/packages/mobile/views/user/forget/Index.vue

@@ -63,13 +63,14 @@ import cryptojs from 'crypto-js'
 import { i18n, useUserStore } from '@/stores'
 import { getCountryCodeList } from '@/constants/unit'
 
-const show = shallowRef(false) // 是否弹出选择器
 const datalist = computed(() => {
     return getCountryCodeList().map(e => {
         return { text: e.value, value: e.value }
     })
 })
-const countryCode = ref(datalist.value[0].value.toString())
+const show = shallowRef(false) // 是否弹出选择器
+const countryCode = ref(datalist.value[0]?.value.toString())
+
 const onCancel = () => {
     show.value = false
 }
@@ -188,12 +189,11 @@ const formSubmit = () => {
             const logincode = res.data
             const encryptedData = cryptojs.SHA256(logincode + password).toString()
             const encryptedHex = cryptojs.enc.Hex.parse(encryptedData).toString().toLocaleLowerCase()
-            formData.mobile = countryCode.value + formData.mobile
 
             resetPassword({
                 data: {
                     logincode,
-                    mobile: getEncryptMobile(mobile),
+                    mobile: getEncryptMobile(countryCode.value + mobile),
                     password: encryptedHex,
                     vcode,
                 }

src/packages/mobile/views/user/register/Index.vue

@@ -99,13 +99,15 @@ defineProps({
   }
 })
 
-const show = shallowRef(false) // 是否弹出选择器
+// 是否弹出选择器
+const show = shallowRef(false) 
 const datalist = computed(() => {
   return getCountryCodeList().map(e => {
     return { text: e.value, value: e.value }
   })
 })
-const countryCode = ref(datalist.value[0].value.toString())
+const countryCode = ref(datalist.value[0]?.value.toString())
+
 const onCancel = () => {
   show.value = false
 }

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -40,7 +40,7 @@
                     </el-form-item>
                 </template>
                 <template v-else-if="(item.fieldcode === 'bank_branch_name')">
-                    <el-form-item :label="item.fieldname" :prop="item.fieldcode" v-if="showExtendInfo(item)">
+                    <el-form-item :label="t('banksign.branchbankname')" :prop="item.fieldcode" v-if="showExtendInfo(item)">
                         <el-select effect="dark" :placeholder="t('common.pleaseenter')" v-model="item.value"
                             value-key="branchnum" :loading="searchLoading" :remote-method="remoteMethod" filterable
                             remote clearable allow-create @change="onBankChange" @clear="dataList = []">

src/packages/pc/views/footer/pricing/detail2/components/delivery/index.vue

@@ -1,6 +1,6 @@
 <!-- 挂牌点价-订单明细-交收 -->
 <template>
-    <app-drawer :title="t('operation.delivery')" :width="840" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="selectedRow.tHDetailEx.buyOrSell === 0 ? t('operation.pickup') : t('operation.delivery')" :width="840" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules">
             <el-form-item :label="t('position.goods.goodsname')">
                 <span>{{ selectedRow.goodsCode }}</span>

src/packages/pc/views/footer/pricing/detail2/index.vue

@@ -120,7 +120,7 @@ const tableColumns = shallowRef<Partial<Column>[]>([
             <el-button type="danger" size="small" onClick={() => showComponent('transfer', rowData)}>{t('operation.close')}</el-button>
         {
             
-            deliveryflag(rowData) != 0 && <el-button type="primary" size="small" onClick={() => showComponent('delivery', rowData)}>{t('operation.delivery')}</el-button>
+            deliveryflag(rowData) != 0 && <el-button type="primary" size="small" onClick={() => showComponent('delivery', rowData)}>{ rowData.tHDetailEx.buyOrSell === 0 ? t('operation.pickup') : t('operation.delivery') }</el-button>
         }