diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue index 28ddb0487650e8b211c93db564b37661d6e80419..dddb5bfdde23a0d2c5741080b42de1e470d9c282 100644 --- a/src/views/authentication/LoginView.vue +++ b/src/views/authentication/LoginView.vue @@ -17,14 +17,17 @@ <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">登录</span> </p> </van-col> <van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial'; -}">请使用手机å·ç™»å½•</span></van-col> +}">è¯·ä½¿ç”¨æ‰‹æœºå·æˆ–身份è¯å·ç™»å½•</span></van-col> </van-row> <van-form> <div class="logindiv"> - <span class="sopan">手机å·</span> - <van-field v-model="phone" label="+86 |" :border="true" placeholder="请输入手机å·" - :rules="[{ validator: verifyPhone, message: '请输入æ£ç¡®çš„æ‰‹æœºå·ç ' }]" /> + <span class="sopan">è´¦å·</span> + <van-field v-model="loginNo" :border="true" placeholder="è¯·è¾“å…¥æ‰‹æœºå·æˆ–身份è¯å·" + /> + + <!-- :rules="[{ validator: verifyPhone, message: '请输入æ£ç¡®çš„æ‰‹æœºå·ç ' }]" --> </div> + <van-divider :style="{ margin: 0 }"></van-divider> <!-- <div class="logindiv"> --> <span class="sopan">密ç </span> @@ -36,9 +39,11 @@ </span> </template> </van-field> + <!-- <van-divider :style="{ margin: 0 }"></van-divider> --> + <!-- <van-divider /> --> <!-- </div> --> - <div class="d-flex "> + <!-- <div class="d-flex "> <div class="p-2 mr-auto "> <span class="sopan">验è¯ç </span> <van-field center clearable v-model="imageSrcValue" placeholder="请输入验è¯ç " /> @@ -46,7 +51,7 @@ <div class="p-2 "> <img :src="imageSrc" style="max-width: 100px; max-height: 200px;" @click="_updatePicCode()" /> </div> - </div> + </div> --> <!-- <template > <img :src="imageSrc" style="max-width: 100px; max-height: 200px;" /> @@ -56,11 +61,13 @@ <van-row class=""> <van-col span="16"> <van-field v-model="sms" center clearable placeholder="请输入çŸä¿¡éªŒè¯ç "> - <!-- <van-divider /> --> + </van-field> </van-col> - <van-col span="8"><a style="color:#3672F1" @click="getPhonePost()">{{ getCmstotal }}</a></van-col> + <van-col span="8"><a style=" color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;" @click="getPhonePost()">{{ getCmstotal }}</a></van-col> </van-row> + <van-divider :style="{ margin: 0 }"></van-divider> + <div style="margin: 16px;"> <van-button square block type="info" native-type="submit" @click="loginSystem()">登录</van-button> </div> @@ -99,9 +106,9 @@ import { log } from "mathjs"; [VanImage.name]: VanImage, }) export default class LoginView extends Vue { - getCmstotal = "获å–çŸä¿¡éªŒè¯ç "; + getCmstotal = "获å–验è¯ç "; tatleName = "用户登录"; - phone: string = "";//ç”µè¯ + loginNo: string = "";//ç™»å½•è´¦å· password: string = "";//密ç imageSrc: any = "";//图形 imageSrcValue: string = "";//图形验è¯ç @@ -122,9 +129,9 @@ export default class LoginView extends Vue { } //æ‰‹æœºå· - verifyPhone() { - return /^1\d{10}$/.test(this.phone) // 返回true或false - } + // verifyPhone() { + // return /^1\d{10}$/.test(this.phone) // 返回true或false + // } //获å–图形验è¯ç _updatePicCode() { //请求图形验è¯ç @@ -151,7 +158,7 @@ export default class LoginView extends Vue { //获å–çŸä¿¡éªŒè¯ç getPhonePost() { let param = { - phoneCode: this.phone + phoneCode: this.loginNo } apiService.general(commonApi.getPicCode, param, undefined, undefined).then((response: RestfulResponse) => { @@ -169,7 +176,7 @@ export default class LoginView extends Vue { //验è¯ç 失败刷新 //this._updatePicCode(); let param = { - phone: this.phone, + phone: this.loginNo, //图形验è¯ç imageVerifyKey: this.imageSrcValue, //æ¸ é“ @@ -202,7 +209,7 @@ export default class LoginView extends Vue { this.$router.push({ name: `ForgetPass`, params: { - phone: this.phone + phone: this.loginNo } }); } diff --git a/src/views/login/ForgetPassView.vue b/src/views/login/ForgetPassView.vue index c3c4837e301e895d5cf63a6169b0ade1e4cd64ab..eee858bbb89cf676b53167fbc01ea8239e5bbcc9 100644 --- a/src/views/login/ForgetPassView.vue +++ b/src/views/login/ForgetPassView.vue @@ -28,21 +28,22 @@ class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial'; }" - >请使用注册手机å·è¿›è¡Œå¯†ç é‡ç½®</span + >è¯·ä½¿ç”¨æ³¨å†Œæ‰‹æœºå·æˆ–身份è¯å·è¿›è¡Œå¯†ç é‡ç½®</span ></van-col > </van-row> <van-form @submit="onSubmit"> <div class="logindiv"> - <span class="sopan">手机å·ç </span> + <span class="sopan">è´¦å·</span> <van-field - v-model="phone" - label="+86 |" + v-model="loginNo" :border="true" - placeholder="请输入手机å·" + placeholder="è¯·è¾“å…¥æ‰‹æœºå·æˆ–身份è¯å·" /> - <van-divider /> + </div> + <van-divider :style="{ margin: 0 }"></van-divider> + <div class="logindiv"> <span class="sopan">新密ç </span> @@ -64,8 +65,9 @@ </van-field> <!-- <van-divider /> --> </div> + <van-divider :style="{ margin: 0 }"></van-divider> <div class="logindiv"> - <span class="sopan">新密ç </span> + <span class="sopan">确认密ç </span> <van-field v-model="restpassword" :type="password" @@ -84,6 +86,7 @@ </van-field> <!-- <van-divider /> --> </div> + <van-divider :style="{ margin: 0 }"></van-divider> <span class="sopan">çŸä¿¡éªŒè¯ç </span> <div> <van-row> @@ -98,10 +101,11 @@ </van-field> </van-col> <van-col span="8" - ><a href="#" @click="getPhonePost()">获å–çŸä¿¡éªŒè¯ç </a></van-col + ><a href="#" style=" color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;" @click="getPhonePost()">获å–验è¯ç </a></van-col > </van-row> </div> + <van-divider :style="{ margin: 0 }"></van-divider> <div style="margin: 16px"> <van-button square block type="info" native-type="submit" >登录</van-button @@ -128,7 +132,7 @@ export default class ForgetPassView extends Vue { passwordType="password" getCmstotal = "获å–çŸä¿¡éªŒè¯ç "; tatleName = "密ç é‡ç½®"; - phone: string = ""; //ç”µè¯ + loginNo: string = ""; //ç™»å½•è´¦å· newpassword: string = ""; //密ç restpassword: string = ""; //密ç imageSrc: string = ""; //图形 @@ -160,7 +164,7 @@ export default class ForgetPassView extends Vue { } getPhonePost() { let param = { - phoneCode: this.phone, + phoneCode: this.loginNo, }; apiService .general(commonApi.getPicCode, param, undefined, undefined) diff --git a/src/views/login/Register.vue b/src/views/login/Register.vue index bd6a2df5540919bafe644abf59bd3ebfe7ab8e2b..be09050891c8ac08248b71a4103d0a08118b88d0 100644 --- a/src/views/login/Register.vue +++ b/src/views/login/Register.vue @@ -15,28 +15,30 @@ <div class="login"> <van-row style="padding: 10% 0%;"> <van-col span="24"> - <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">用户注册</span> </p> + <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">注册</span> </p> </van-col> <van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial'; -}">请使用机å·ç 进行注册</span></van-col> +}">请使用机å·ç 或身份è¯å·ç 进行注册</span></van-col> </van-row> <van-form> <div class="logindiv"> - <span class="sopan">手机å·ç </span> - <van-field v-model="phone" label="+86 |" :border="true" placeholder="请输入手机å·" - :rules="[{ validator: verifyPhone, message: '请输入æ£ç¡®çš„æ‰‹æœºå·ç ' }]" /> - + <span class="sopan">è´¦å·</span> + <van-field v-model="phone" :border="true" placeholder="请输入手机å·ç /身份è¯å·ç " + /> + <van-divider :style="{ margin: 0 }"></van-divider> + <!-- error-message="请输入手机å·ç 或身份è¯å·ç " --> + <!-- :rules="[{ validator: verifyPhone, message: '请输入æ£ç¡®çš„æ‰‹æœºå·ç /身份è¯å·ç ' }]" --> </div> - <div class="logindiv"> - <span class="sopan">身份è¯å·</span> + <!-- <div class="logindiv"> + <span class="sopan">身份è¯å·</span> --> - <van-field v-model="idCard" :border="true" placeholder="请输入身份è¯å·" - :rules="[{ validator: verifyid, message: '请输入æ£ç¡®çš„身份è¯å·ç ' }]" /> + <!-- <van-field v-model="idCard" :border="true" placeholder="请输入身份è¯å·" + :rules="[{ validator: verifyid, message: '请输入æ£ç¡®çš„身份è¯å·ç ' }]" /> --> <!-- <van-divider /> --> - <van-divider :style="{ margin: 0 }"></van-divider> - </div> + <!-- <van-divider :style="{ margin: 0 }"></van-divider> + </div> --> <div class="logindiv"><span class="sopan">çŸä¿¡éªŒè¯ç </span> @@ -46,7 +48,8 @@ <!-- <van-divider /> --> </van-field> </van-col> - <van-col span="8"><span style="color:blue" @click="getPhonePost()">{{ getCmstotal }}</span></van-col> + <van-col span="8"><span style=" color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;" + @click="getPhonePost()">{{ getCmstotal }}</span></van-col> </van-row> <van-divider :style="{ margin: 0 }"></van-divider> @@ -170,7 +173,7 @@ export default class ForgetPassView extends Vue { this.getCmstotal = this.time + "sé‡å‘验è¯ç "; if (this.time < 0) { clearInterval(this.time) - this.getCmstotal = "获å–çŸä¿¡éªŒè¯ç "; + this.getCmstotal = "获å–验è¯ç "; } }, 1000) diff --git a/src/views/main/Main.vue b/src/views/main/Main.vue index cc4881eeeb411d05f5a157b4af3cabfbfb038e1a..81c5d8216fe80b85e5435a99d12e25a90704192a 100644 --- a/src/views/main/Main.vue +++ b/src/views/main/Main.vue @@ -54,9 +54,36 @@ <div style="background-color: #ffff; height: 18%"> <div class="prudect"> - <span style="font-size: 18px; font-weight: 600; margin-left: 4%" - >推è产å“</span + + <van-row type="flex"> + <span style="padding:20px 16px; font-size: 18px; font-weight: 600; margin-left: 4% width: 30%; height:44px;" >推è产å“</span> + + <van-cell + style="font-size: 18px; padding:15px 16px; width: 72%; " + border="false" + center="true" + :value="outcsinfo.place" + @click="onAddress"> + <template #right-icon> + <van-icon name="location-o" /> + </template> + </van-cell> + <van-popup + v-model="showAddress" + position="bottom" + :style="{ height: '50%' }" > + <van-area + title="请选择地区" + @confirm="changeAddress" + :area-list="areaList" + columns-num="3" + /> + </van-popup> + + </van-row> + + <!-- <van-area title="选择区域" :area-list="areaList" /> --> </div> <div> <!-- <van-tabs v-model="activeName"> @@ -65,167 +92,27 @@ <van-tab title="期é™" name="c"></van-tab> <van-tab title="利率" name="d"></van-tab> </van-tabs> --> - <van-dropdown-menu style="height: 100%"> - <van-dropdown-item title="ç»¼åˆæŽ’åº" ref="item" style="height: 100%"> - <div - class="application" - v-for="(item, index) in applicaList.slice(0, 1)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> + <van-row type="flex" class="tab"> + + + <van-tabs v-model="active" @click="onClick" style="width:75%" > + - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol11" @click="clickButton1(index,1)"> - {{ item.fristsize }} - </div> - </van-col> - <van-col span="6"> - <div :class="vanvcol12" @click="clickButton1(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol13" @click="clickButton1(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol14" @click="clickButton1(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - <div - class="application" - v-for="(item, index) in applicaList.slice(1, 2)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> + <van-tab v-for="index in tabsList" :key="index"> + <template #title >{{index.name}} <van-icon :name="index.status===1? 'arrow-up' :'arrow-down'"/> + - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol21" @click="clickButton2(index,1)"> {{ item.fristsize }} - </div> - </van-col> - <van-col span="6"> - <div :class="vanvcol22" @click="clickButton2(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol23" @click="clickButton2(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol24" @click="clickButton2(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - </div> + + </template> + </van-tab> + + </van-tabs> - <div - class="application" - v-for="(item, index) in applicaList.slice(3, 4)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> - - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol41" @click="clickButton4(index,1)"> {{ item.fristsize }} - </div> - </van-col> - <van-col span="6"> - <div :class="vanvcol42" @click="clickButton4(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol43" @click="clickButton4(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol44" @click="clickButton4(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - </div> - <div - class="application" - v-for="(item, index) in applicaList.slice(2, 3)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> - - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol31" @click="clickButton3(index,1)"> {{ item.fristsize }} - </div> - </van-col> - <van-col span="6"> - <div :class="vanvcol32" @click="clickButton3(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol33" @click="clickButton3(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol34" @click="clickButton3(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - </div> - - - </div> - <div style="margin-top: 4%"> - <van-row type="flex"> - <van-col span="12"> - <van-button square block type="default">é‡ç½®</van-button> - </van-col> - <van-col span="12"> - <van-button square block type="info">确定</van-button> - </van-col> - </van-row> - </div> - </van-dropdown-item> - <van-dropdown-item title="金é¢" ref="item"> + <van-dropdown-menu style="height: 44px; width:25%;"> + <van-dropdown-item title="综åˆç›é€‰" ref="item" > <div class="application" v-for="(item, index) in applicaList.slice(0, 1)" @@ -247,114 +134,154 @@ <van-row type="flex" gutter="10" class="applicationfole"> <!-- div--> <van-col span="6"> - <div :class="vanvcol11" @click="clickButton1(index,1)"> + <div :class="vanvcol11" @click="clickButton1(index, 1)"> {{ item.fristsize }} </div> </van-col> <van-col span="6"> - <div :class="vanvcol12" @click="clickButton1(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol13" @click="clickButton1(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol14" @click="clickButton1(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - </div> - <div style="margin-top: 4%"> - <van-row type="flex"> - <van-col span="12"> - <van-button square block type="default">é‡ç½®</van-button> - </van-col> - <van-col span="12"> - <van-button square block type="info">确定</van-button> - </van-col> - </van-row> - </div> - </van-dropdown-item> - <van-dropdown-item title="期é™" ref="item"> - <div - class="application" - v-for="(item, index) in applicaList.slice(1, 2)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> - - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol21" @click="clickButton2(index,1)"> {{ item.fristsize }} + <div :class="vanvcol12" @click="clickButton1(index, 2)"> + {{ item.secondsize }} </div> </van-col> <van-col span="6"> - <div :class="vanvcol22" @click="clickButton2(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol23" @click="clickButton2(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol24" @click="clickButton2(index,4)">{{ item.foursize }}</div> - </van-col> - </van-row> - </div> - <div style="margin-top: 4%"> - <van-row type="flex"> - <van-col span="12"> - <van-button square block type="default">é‡ç½®</van-button> - </van-col> - <van-col span="12"> - <van-button square block type="info">确定</van-button> - </van-col> - </van-row> - </div> - </van-dropdown-item> - <van-dropdown-item title="利率" ref="item"> - <div - class="application" - v-for="(item, index) in applicaList.slice(2, 3)" - :key="index" - > - <van-row type="flex" class="applicationName"> - <van-col span="24">{{ item.name }}</van-col> - </van-row> - <van-row type="flex" class="applicationfale"> - <van-col span="10"> - <div class="vandiv">{{ item.min }}</div> - </van-col> - <van-col span="2">-</van-col> - <van-col span="10"> - <div class="vandiv">{{ item.max }}</div> - </van-col> - </van-row> - - <van-row type="flex" gutter="10" class="applicationfole"> - <!-- div--> - <van-col span="6"> - <div :class="vanvcol31" @click="clickButton3(index,1)"> {{ item.fristsize }} + <div :class="vanvcol13" @click="clickButton1(index, 3)"> + {{ item.thirdsize }} </div> </van-col> <van-col span="6"> - <div :class="vanvcol32" @click="clickButton3(index,2)">{{ item.secondsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol33" @click="clickButton3(index,3)">{{ item.thirdsize }}</div> - </van-col> - <van-col span="6"> - <div :class="vanvcol34" @click="clickButton3(index,4)">{{ item.foursize }}</div> + <div :class="vanvcol14" @click="clickButton1(index, 4)"> + {{ item.foursize }} + </div> </van-col> </van-row> + <div + class="application" + v-for="(item, index) in applicaList.slice(1, 2)" + :key="index" + > + <van-row type="flex" class="applicationName"> + <van-col span="24">{{ item.name }}</van-col> + </van-row> + <van-row type="flex" class="applicationfale"> + <van-col span="10"> + <div class="vandiv">{{ item.min }}</div> + </van-col> + <van-col span="2">-</van-col> + <van-col span="10"> + <div class="vandiv">{{ item.max }}</div> + </van-col> + </van-row> + + <van-row type="flex" gutter="10" class="applicationfole"> + <!-- div--> + <van-col span="6"> + <div :class="vanvcol21" @click="clickButton2(index, 1)"> + {{ item.fristsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol22" @click="clickButton2(index, 2)"> + {{ item.secondsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol23" @click="clickButton2(index, 3)"> + {{ item.thirdsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol24" @click="clickButton2(index, 4)"> + {{ item.foursize }} + </div> + </van-col> + </van-row> + </div> + + <div + class="application" + v-for="(item, index) in applicaList.slice(3, 4)" + :key="index" + > + <van-row type="flex" class="applicationName"> + <van-col span="24">{{ item.name }}</van-col> + </van-row> + <van-row type="flex" class="applicationfale"> + <van-col span="10"> + <div class="vandiv">{{ item.min }}</div> + </van-col> + <van-col span="2">-</van-col> + <van-col span="10"> + <div class="vandiv">{{ item.max }}</div> + </van-col> + </van-row> + + <van-row type="flex" gutter="10" class="applicationfole"> + <!-- div--> + <van-col span="6"> + <div :class="vanvcol41" @click="clickButton4(index, 1)"> + {{ item.fristsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol42" @click="clickButton4(index, 2)"> + {{ item.secondsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol43" @click="clickButton4(index, 3)"> + {{ item.thirdsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol44" @click="clickButton4(index, 4)"> + {{ item.foursize }} + </div> + </van-col> + </van-row> + </div> + + <div + class="application" + v-for="(item, index) in applicaList.slice(2, 3)" + :key="index" + > + <van-row type="flex" class="applicationName"> + <van-col span="24">{{ item.name }}</van-col> + </van-row> + <van-row type="flex" class="applicationfale"> + <van-col span="10"> + <div class="vandiv">{{ item.min }}</div> + </van-col> + <van-col span="2">-</van-col> + <van-col span="10"> + <div class="vandiv">{{ item.max }}</div> + </van-col> + </van-row> + + <van-row type="flex" gutter="10" class="applicationfole"> + <!-- div--> + <van-col span="6"> + <div :class="vanvcol31" @click="clickButton3(index, 1)"> + {{ item.fristsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol32" @click="clickButton3(index, 2)"> + {{ item.secondsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol33" @click="clickButton3(index, 3)"> + {{ item.thirdsize }} + </div> + </van-col> + <van-col span="6"> + <div :class="vanvcol34" @click="clickButton3(index, 4)"> + {{ item.foursize }} + </div> + </van-col> + </van-row> + </div> </div> <div style="margin-top: 4%"> <van-row type="flex"> @@ -368,6 +295,9 @@ </div> </van-dropdown-item> </van-dropdown-menu> + + + </van-row> </div> <scroller-view v-calculate-height> <div @@ -392,7 +322,41 @@ import { Component, Vue } from "vue-property-decorator"; import { ProductData } from "@/model/entity/ProductData"; import { i } from "mathjs"; - +import { Toast } from 'vant'; +import { Area } from "vant"; +import { Cell, CellGroup } from 'vant'; +import { Tabbar, TabbarItem } from 'vant'; +import { Tab, Tabs } from 'vant'; +Vue.use(Cell); +Vue.use(CellGroup); +Vue.use(Area); +Vue.use(Toast); + + +Vue.use(Tab); +Vue.use(Tabs); +// import { areaList } from '@vant/area-data'; + +// export default { +// data() { +// return { areaList }; +// }, +// }; +const areaList = { + province_list: { + 110000: "北京市", + 120000: "天津市", + }, + city_list: { + 110100: "北京市", + 120100: "天津市", + }, + county_list: { + 110101: "东城区", + 110102: "西城区", + // .... + }, +}; @Component({ name: "Main", }) @@ -400,25 +364,60 @@ export default class Main extends Vue { tatleName = "çº¿ä¸Šé‡‘èžæœåС平å°"; notice = "在代ç 阅读过程ä¸äººä»¬è¯´è„è¯çš„频率是衡é‡ä»£ç è´¨é‡çš„å”¯ä¸€æ ‡å‡†ã€‚"; vanvcol11 = "vandilote"; - vanvcol12 ="vandilote"; - vanvcol13 ="vandilote"; - vanvcol14 ="vandilote"; + vanvcol12 = "vandilote"; + vanvcol13 = "vandilote"; + vanvcol14 = "vandilote"; vanvcol21 = "vandilote"; - vanvcol22 ="vandilote"; - vanvcol23 ="vandilote"; - vanvcol24 ="vandilote"; - + vanvcol22 = "vandilote"; + vanvcol23 = "vandilote"; + vanvcol24 = "vandilote"; vanvcol31 = "vandilote"; - vanvcol32 ="vandilote"; - vanvcol33 ="vandilote"; - vanvcol34 ="vandilote"; + vanvcol32 = "vandilote"; + vanvcol33 = "vandilote"; + vanvcol34 = "vandilote"; vanvcol41 = "vandilote"; - vanvcol42 ="vandilote"; - vanvcol43 ="vandilote"; - vanvcol44 ="vandilote"; + vanvcol42 = "vandilote"; + vanvcol43 = "vandilote"; + vanvcol44 = "vandilote"; + active=0; + areaList = { + province_list: { + 110000: "北京市", + 120000: "天津市", + }, + city_list: { + 110100: "北京市", + 120100: "天津市", + }, + county_list: { + 110101: "东城区", + 110102: "西城区", + // .... + }, + }; + outcsinfo = { + + place:'请选择地区',//出行地点 + + }; + showAddress=false; + onAddress(){ + this.showAddress=true + }; + // 点击地å€é€‰æ‹©æ¡†çš„确认 + changeAddress(event:any){ + // console.log(event,'è¿”å›žæ ¼å¼æ•°ç»„') + this.showAddress=false + let st='' + event.forEach((item:any)=>{ + st=st + item.name + }) + this.outcsinfo.place=st + }; + //测试 demo() { @@ -427,9 +426,25 @@ export default class Main extends Vue { }); } - //div列表 + tabsList: any=[ + { + name: "金é¢", + status:0, + + }, + { + name: "期é™", + status:0, + + }, + { + name: "利率", + status:0, + + }, + ] applicaList: any = [ { name: "产å“金é¢ï¼ˆä¸‡å…ƒï¼‰", @@ -519,6 +534,9 @@ export default class Main extends Vue { flag: true, }; + + + productList: ProductData[] = [ { productname: "é‡‘èžæ¶ˆè´¹è´·", //产å“åç§° @@ -545,136 +563,128 @@ export default class Main extends Vue { // } }); } - //åˆ‡æ¢ - clickButton1(index: number,item:number) { - var select =this.applicaList[index].sellet=item; - - console.log( this.applicaList[index].sellet); - if (item=== 1) { - this.vanvcol11 = "vancoll"; - - this.vanvcol12 = "vandilote"; - this.vanvcol13 = "vandilote"; - this.vanvcol14 = "vandilote"; - console.log( this.applicaList[index].sellet); - } else if(item=== 2){ - this.vanvcol11 = "vandilote"; - - this.vanvcol12 = "vancoll"; - this.vanvcol13 = "vandilote"; - this.vanvcol14 = "vandilote"; - }else if(item=== 3){ - this.vanvcol11 = "vandilote"; - - this.vanvcol12 = "vandilote"; - this.vanvcol13 = "vancoll"; - this.vanvcol14 = "vandilote"; - } - else if(item=== 4){ - this.vanvcol11 = "vandilote"; - - this.vanvcol12 = "vandilote"; - this.vanvcol13 = "vandilote"; - this.vanvcol14 = "vancoll"; - } - + //åˆ‡æ¢ + clickButton1(index: number, item: number) { + var select = (this.applicaList[index].sellet = item); + + console.log(this.applicaList[index].sellet); + if (item === 1) { + this.vanvcol11 = "vancoll"; + + this.vanvcol12 = "vandilote"; + this.vanvcol13 = "vandilote"; + this.vanvcol14 = "vandilote"; + console.log(this.applicaList[index].sellet); + } else if (item === 2) { + this.vanvcol11 = "vandilote"; + + this.vanvcol12 = "vancoll"; + this.vanvcol13 = "vandilote"; + this.vanvcol14 = "vandilote"; + } else if (item === 3) { + this.vanvcol11 = "vandilote"; + + this.vanvcol12 = "vandilote"; + this.vanvcol13 = "vancoll"; + this.vanvcol14 = "vandilote"; + } else if (item === 4) { + this.vanvcol11 = "vandilote"; + + this.vanvcol12 = "vandilote"; + this.vanvcol13 = "vandilote"; + this.vanvcol14 = "vancoll"; } + } - clickButton2(index: number,item:number) { - var select =this.applicaList[index].sellet=item; - - console.log( this.applicaList[index].sellet); - if (item=== 1) { - this.vanvcol21 = "vancoll"; - this.vanvcol22 = "vandilote"; - this.vanvcol23 = "vandilote"; - this.vanvcol24 = "vandilote"; - console.log( this.applicaList[index].sellet); - } else if(item=== 2){ - this.vanvcol21 = "vandilote"; - this.vanvcol22 = "vancoll"; - this.vanvcol23 = "vandilote"; - this.vanvcol24 = "vandilote"; - }else if(item=== 3){ - this.vanvcol21 = "vandilote"; - this.vanvcol22 = "vandilote"; - this.vanvcol23 = "vancoll"; - this.vanvcol24 = "vandilote"; - } - else if(item=== 4){ - this.vanvcol21 = "vandilote"; - this.vanvcol22 = "vandilote"; - this.vanvcol23 = "vandilote"; - this.vanvcol24 = "vancoll"; - } - + clickButton2(index: number, item: number) { + var select = (this.applicaList[index].sellet = item); + + console.log(this.applicaList[index].sellet); + if (item === 1) { + this.vanvcol21 = "vancoll"; + this.vanvcol22 = "vandilote"; + this.vanvcol23 = "vandilote"; + this.vanvcol24 = "vandilote"; + console.log(this.applicaList[index].sellet); + } else if (item === 2) { + this.vanvcol21 = "vandilote"; + this.vanvcol22 = "vancoll"; + this.vanvcol23 = "vandilote"; + this.vanvcol24 = "vandilote"; + } else if (item === 3) { + this.vanvcol21 = "vandilote"; + this.vanvcol22 = "vandilote"; + this.vanvcol23 = "vancoll"; + this.vanvcol24 = "vandilote"; + } else if (item === 4) { + this.vanvcol21 = "vandilote"; + this.vanvcol22 = "vandilote"; + this.vanvcol23 = "vandilote"; + this.vanvcol24 = "vancoll"; } + } - clickButton3(index: number,item:number) { - var select =this.applicaList[index].sellet=item; - - console.log( this.applicaList[index].sellet); - if (item=== 1) { - this.vanvcol31 = "vancoll"; - this.vanvcol32 = "vandilote"; - this.vanvcol33 = "vandilote"; - this.vanvcol34 = "vandilote"; - console.log( this.applicaList[index].sellet); - } else if(item=== 2){ - this.vanvcol31 = "vandilote"; - this.vanvcol32 = "vancoll"; - this.vanvcol33 = "vandilote"; - this.vanvcol34 = "vandilote"; - }else if(item=== 3){ - this.vanvcol31 = "vandilote"; - this.vanvcol32 = "vandilote"; - this.vanvcol33 = "vancoll"; - this.vanvcol34 = "vandilote"; - } - else if(item=== 4){ - this.vanvcol31 = "vandilote"; - this.vanvcol32 = "vandilote"; - this.vanvcol33 = "vandilote"; - this.vanvcol34 = "vancoll"; - } - + clickButton3(index: number, item: number) { + var select = (this.applicaList[index].sellet = item); + + console.log(this.applicaList[index].sellet); + if (item === 1) { + this.vanvcol31 = "vancoll"; + this.vanvcol32 = "vandilote"; + this.vanvcol33 = "vandilote"; + this.vanvcol34 = "vandilote"; + console.log(this.applicaList[index].sellet); + } else if (item === 2) { + this.vanvcol31 = "vandilote"; + this.vanvcol32 = "vancoll"; + this.vanvcol33 = "vandilote"; + this.vanvcol34 = "vandilote"; + } else if (item === 3) { + this.vanvcol31 = "vandilote"; + this.vanvcol32 = "vandilote"; + this.vanvcol33 = "vancoll"; + this.vanvcol34 = "vandilote"; + } else if (item === 4) { + this.vanvcol31 = "vandilote"; + this.vanvcol32 = "vandilote"; + this.vanvcol33 = "vandilote"; + this.vanvcol34 = "vancoll"; } + } - clickButton4(index: number,item:number) { - var select =this.applicaList[index].sellet=item; - - console.log( this.applicaList[index].sellet); - if (item=== 1) { - this.vanvcol41 = "vancoll"; - this.vanvcol42 = "vandilote"; - this.vanvcol43 = "vandilote"; - this.vanvcol44 = "vandilote"; - console.log( this.applicaList[index].sellet); - } else if(item=== 2){ - this.vanvcol41 = "vandilote"; - this.vanvcol42 = "vancoll"; - this.vanvcol43 = "vandilote"; - this.vanvcol44 = "vandilote"; - }else if(item=== 3){ - this.vanvcol41 = "vandilote"; - this.vanvcol42 = "vandilote"; - this.vanvcol43 = "vancoll"; - this.vanvcol44 = "vandilote"; - } - else if(item=== 4){ - this.vanvcol41 = "vandilote"; - this.vanvcol42 = "vandilote"; - this.vanvcol43 = "vandilote"; - this.vanvcol44 = "vancoll"; - } - + clickButton4(index: number, item: number) { + var select = (this.applicaList[index].sellet = item); + + console.log(this.applicaList[index].sellet); + if (item === 1) { + this.vanvcol41 = "vancoll"; + this.vanvcol42 = "vandilote"; + this.vanvcol43 = "vandilote"; + this.vanvcol44 = "vandilote"; + console.log(this.applicaList[index].sellet); + } else if (item === 2) { + this.vanvcol41 = "vandilote"; + this.vanvcol42 = "vancoll"; + this.vanvcol43 = "vandilote"; + this.vanvcol44 = "vandilote"; + } else if (item === 3) { + this.vanvcol41 = "vandilote"; + this.vanvcol42 = "vandilote"; + this.vanvcol43 = "vancoll"; + this.vanvcol44 = "vandilote"; + } else if (item === 4) { + this.vanvcol41 = "vandilote"; + this.vanvcol42 = "vandilote"; + this.vanvcol43 = "vandilote"; + this.vanvcol44 = "vancoll"; } - } - - - + onClick(index:any) { + this.tabsList[index].status=this.tabsList[index].status === 1?0:1 + Toast(this.tabsList[index].status===1?"å‡åº":"é™åº"); + } +} </script> <style scoped lang="scss"> .roll { @@ -761,15 +771,31 @@ export default class Main extends Vue { bottom: 72px; } -.van-dropdown-item { - position: fixed; +::v-deep .van-dropdown-menu__bar { + position: relative; + display: -webkit-box; + display: -webkit-flex; + display: flex; + height: 44px; + background-color: #ffffff; + box-shadow: none; +} + +::v-deep .van-dropdown-item { + position: relative; right: 0; left: 0; z-index: 10; + overflow: hidden; height: 100%; } #fristsize { background-color: #1890ff; } + +.van-cell__value--alone { + color: #1890ff; + text-align: right; +} </style>