kevin_zhangl 2 years ago
parent
commit
6ce23abc30

+ 1 - 1
.env.production

@@ -4,7 +4,7 @@ ENV='production'
 # base api
 VUE_APP_BASE_API=''
 VUE_APP_BASE_DO_API='https://ng-frontend-api.elken.com'
-VUE_APP_CDN_API='http://ng-upload.elken.com'
+VUE_APP_CDN_API='https://ng-upload.elken.com'
 VUE_APP_BASE_WEBSITE='https://ngds.elken.com'
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_live_fae524f9d073d877beeb661fd825a37a9bc91f0a'
 VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '

+ 1 - 1
src/views/bonus/account-list.vue

@@ -37,7 +37,7 @@
 									style="width: 100%; margin: 10px 0;">
 								</el-date-picker>
 						</el-col>
-						<el-col :xs="24" :sm="24" :lg="6" :span="6">
+						<el-col :xs="24" :sm="24" :lg="6" :span="6" v-if="listQuery.walletType !== 'cash'">
 								<el-select size="small" v-model="listQuery.dealType" :placeholder="$t('bonus.transType')" clearable style="width: 100%; margin: 10px 0;">
 									<el-option v-for="(item, key) in dealTypeList" :label="item" :value="key" :key="key"></el-option>
 								</el-select>

+ 3 - 3
src/views/finance/transfer-list.vue

@@ -117,10 +117,10 @@
 							</el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.memberCode')" prop="toUserName" required>
-							<el-input size="small" v-model.trim="form.toUserName" type="text" @change="fetchMember"></el-input>
+							<el-input size="small" v-model="form.toUserName" type="text" @change="fetchMember"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.memberName')" prop="toRealName" v-show="form.toRealName !== null">
-							<el-input size="small" v-model.trim="form.toRealName" type="text" disabled></el-input>
+							<el-input size="small" v-model="form.toRealName" type="text" disabled></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.transferAmount')" prop="amount" required>
 							<el-input v-model.number="form.amount" type="number" :min="minAmount" :max="maxAmount" @change="chkReal"></el-input>
@@ -132,7 +132,7 @@
 							<el-tag type="warning">{{ realAmount }} {{ $t('currency.naira') }}</el-tag>
 						</el-form-item>
 						<el-form-item :label="$t('finance.remark')" prop="remark">
-							<el-input size="small" v-model.trim="form.remark" type="text"></el-input>
+							<el-input size="small" v-model="form.remark" type="text"></el-input>
 						</el-form-item>
 						<el-form-item>
 							<el-button type="warning" size="small" @click="onCancel">{{ $t('table.cancel') }}</el-button>

+ 1 - 1
src/views/user/member-upgrade.vue

@@ -5,7 +5,7 @@
 				<el-col :xs="24" :sm="16" :lg="16">
 					<el-form :model="form" ref="form" :label-position="labelPosition" label-width="180px" class="form-page">
 						<el-form-item :label="$t('shop.memberCode')" prop="insertUserName">
-							<el-input v-model.trim="form.insertUserName" @blur="fetchUpgradeInfo" :placeholder="$t('user.enterMemberCode')" :rules="{ required: true, message: $t('user.enterMemberCode'), trigger: 'blur' }"></el-input>
+							<el-input v-model="form.insertUserName" @blur="fetchUpgradeInfo" :placeholder="$t('user.enterMemberCode')" :rules="{ required: true, message: $t('user.enterMemberCode'), trigger: 'blur' }"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('profile.memberLevel')">
 							<el-input v-model="form.userDecName" disabled></el-input>

+ 14 - 14
src/views/user/welcome-pack.vue

@@ -14,7 +14,7 @@
 
 						<el-divider content-position="left">{{ $t('user.accountInformation') }}</el-divider>
 						<el-form-item :label="$t('user.newMemberCode')">
-							<el-input v-model.trim="form.insertUserName" @blur="checkBaUser" :readonly="userReadOnly"></el-input>
+							<el-input v-model="form.insertUserName" @blur="checkBaUser" :readonly="userReadOnly"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('user.entryLevel')">
 							<el-select v-model="form.decLv" :placeholder="$t('user.selectEntryLevel')" style="width: 100%;">
@@ -22,7 +22,7 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item :label="$t('user.stockistCode')">
-							<el-input v-model.trim="form.decUserName" readonly></el-input>
+							<el-input v-model="form.decUserName" readonly></el-input>
 						</el-form-item>
 
 						<el-form-item>
@@ -73,13 +73,13 @@
 
 						<el-divider content-position="left">{{ $t('atlas.networkInformation') }}</el-divider>
 						<el-form-item :label="$t('shop.sponsorCode')">
-							<el-input v-model.trim="form.recUserName" @change="handleChkRecUser" :readonly="recReadOnly"></el-input>
+							<el-input v-model="form.recUserName" @change="handleChkRecUser" :readonly="recReadOnly"></el-input>
 						</el-form-item>
 						<el-form-item>
 							<el-input v-model="recRealName" :disabled="true"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('atlas.placementCode')">
-							<el-input v-model.trim="form.conUserName" @change="handleChkConUser"></el-input>
+							<el-input v-model="form.conUserName" @change="handleChkConUser"></el-input>
 						</el-form-item>
 						<el-form-item>
 							<el-input type="textarea" :rows="2" v-model="conRealName" :disabled="true"></el-input>
@@ -103,25 +103,25 @@
 
 						<el-divider content-position="left">{{ $t('profile.personalInformation') }}</el-divider>
 						<el-form-item :label="$t('shop.memberName')">
-							<el-input v-model.trim="form.realName"></el-input>
+							<el-input v-model="form.realName"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('shop.phoneNumber')">
-							<el-input v-model.trim="form.mobile"></el-input>
+							<el-input v-model="form.mobile"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('user.email')">
-							<el-input v-model.trim="form.email"></el-input>
+							<el-input v-model="form.email"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('profile.loginPassword')">
-							<el-input v-model.trim="form.password" maxlength="32" :placeholder="$t('profile.enterLoginPassword')"></el-input>
+							<el-input v-model="form.password" maxlength="32" :placeholder="$t('profile.enterLoginPassword')"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('profile.paymentPassword')">
-							<el-input v-model.trim="form.payPassword" maxlength="32" :placeholder="$t('profile.enterPaymentPassword')"></el-input>
+							<el-input v-model="form.payPassword" maxlength="32" :placeholder="$t('profile.enterPaymentPassword')"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('shop.recipientName')">
-							<el-input v-model.trim="form.consignee"></el-input>
+							<el-input v-model="form.consignee"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('shop.phoneNumber')">
-							<el-input v-model.trim="form.acceptMobile"></el-input>
+							<el-input v-model="form.acceptMobile"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('shop.shipping')">
 							<el-radio-group v-model="form.way" @change="wayChange">
@@ -133,13 +133,13 @@
 							<el-cascader :disabled="areaDisabled" size="large" :placeholder="$t('shop.delivery')" :options="regionData" v-model="form.areaSelected" style="width: 100%;"></el-cascader>
 						</el-form-item>
 						<el-form-item :label="$t('config.detailedAddress')">
-							<el-input :disabled="addressDisabled" v-model.trim="form.address"></el-input>
+							<el-input :disabled="addressDisabled" v-model="form.address"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('config.city')">
-							<el-input :disabled="addressDisabled" v-model.trim="form.cityName"></el-input>
+							<el-input :disabled="addressDisabled" v-model="form.cityName"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('config.localGovernmentArea')">
-							<el-input :disabled="addressDisabled" v-model.trim="form.lgaName"></el-input>
+							<el-input :disabled="addressDisabled" v-model="form.lgaName"></el-input>
 						</el-form-item>
 
 						<el-divider content-position="left">{{ $t('finance.bankInformation') }}</el-divider>