Skip to content

梁建民 / h5

Go to a project
Commit 82540ce2 by 林翔
Options

Merge branch 'lx_wallet_20190423' of http://119.23.72.7/liangjianmin/h5 into lx_wallet_20190423 

# Conflicts:
#	view/21.js
#	view/9.js
#	view/app.js
parents 185396f9 7480fe69
Expand all
Inline Side-by-side
Showing with 23 additions and 19 deletions
src/App.vue
<template> <template>
<div id="app"> <div id="app">
<keep-alive exclude="newsDetail,wallet,status"> <keep-alive exclude="newsDetail,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus">
<router-view class="router-view"></router-view> <router-view class="router-view"></router-view>
</keep-alive> </keep-alive>
</div> </div>
......
src/assets/css/wallet/wallet.css
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
/*.recharge-content .payment-content .vanCell .checked{ display: inline-block; height: 60px; vertical-align: middle; float: right; margin-right: 1rem; position: relative; } /*.recharge-content .payment-content .vanCell .checked{ display: inline-block; height: 60px; vertical-align: middle; float: right; margin-right: 1rem; position: relative; }
.recharge-content .payment-content .vanCell .checked img{ width: 22px; height: 22px; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; }*/ .recharge-content .payment-content .vanCell .checked img{ width: 22px; height: 22px; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; }*/
.recharge-content .recharge { .recharge-content .recharge {
position: fixed; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -365,6 +365,8 @@ ...@@ -365,6 +365,8 @@
background: #1080d0; background: #1080d0;
color: #ffffff; color: #ffffff;
font-size: 16px; font-size: 16px;
z-index: 9999999999;
transition: all 0.2s ease;
} }
.recharge-content .rechargeNO { .recharge-content .rechargeNO {
...@@ -640,7 +642,7 @@ ...@@ -640,7 +642,7 @@
} }
.withdraw-content .submit { .withdraw-content .submit {
position: fixed; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -649,6 +651,8 @@ ...@@ -649,6 +651,8 @@
background: #1080d0; background: #1080d0;
color: #ffffff; color: #ffffff;
font-size: 16px; font-size: 16px;
z-index: 999999999999;
transition: all 0.2s ease;
} }
.withdraw-content .submitNO { .withdraw-content .submitNO {
......
src/views/wallet/Record.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
Vue.use(Icon).use(Popup).use(DatetimePicker).use(Picker).use(Toast); Vue.use(Icon).use(Popup).use(DatetimePicker).use(Picker).use(Toast);
export default { export default {
name: 'WalletRecord', name: 'walletRecord',
data() { data() {
return { return {
title: "充值提现记录", title: "充值提现记录",
......
src/views/wallet/Retrieve.vue
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<li class="inp-wrap"> <li class="inp-wrap">
<label class="va-m">设置支付密码</label><br> <label class="va-m">设置支付密码</label><br>
<template v-if="showPassword"> <template v-if="showPassword">
<input type="password" placeholder="密码由8~20位字母、数字组合而成" class="va-m inp" v-model="form.password"/> <input type="password" placeholder="密码由6~20位字母、数字组合而成" class="va-m inp" v-model="form.password"/>
</template> </template>
<template v-else> <template v-else>
<input type="text" placeholder="密码由8~20位字母、数字组合而成" class="va-m inp" v-model="form.password"/> <input type="text" placeholder="密码由6~20位字母、数字组合而成" class="va-m inp" v-model="form.password"/>
</template> </template>
<van-icon v-if="showPassword" name="closed-eye" class="va-m f-r" @click="changeShow"/> <van-icon v-if="showPassword" name="closed-eye" class="va-m f-r" @click="changeShow"/>
<van-icon v-else name="eye-o" class="va-m f-r" @click="changeShow"/> <van-icon v-else name="eye-o" class="va-m f-r" @click="changeShow"/>
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
import Vue from 'vue'; import Vue from 'vue';
import {mapState} from 'vuex' import {mapState} from 'vuex'
import Header from '@/views/common/Header.vue'; import Header from '@/views/common/Header.vue';
import { Icon } from 'vant'; import {Icon} from 'vant';
import {productionUrlPc} from '../../api/index'; import {productionUrlPc} from '../../api/index';
Vue.use(Icon); Vue.use(Icon);
export default { export default {
name: 'WalletRetrieve', name: 'walletRetrieve',
data() { data() {
return { return {
title: "找回密码", title: "找回密码",
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
}, },
formError: false, formError: false,
formMsg: '', formMsg: '',
imgCodeVal: productionUrlPc+"public/verify", imgCodeVal: productionUrlPc + "public/verify",
} }
}, },
computed: { computed: {
...@@ -95,18 +95,18 @@ ...@@ -95,18 +95,18 @@
}, },
watch: { watch: {
retieveCountDownFlag(value) { retieveCountDownFlag(value) {
if(value){ if (value) {
this.yzmSend = false; this.yzmSend = false;
this.timeNum(); this.timeNum();
}else{ } else {
this.yzmSend = true; this.yzmSend = true;
} }
}, },
passwordToken(value) { passwordToken(value) {
if(value){ //返回token则验证成功，下一步 if (value) { //返回token则验证成功，下一步
this.step1 = false; this.step1 = false;
this.step2 = true; this.step2 = true;
}else{ } else {
this.step1 = true; this.step1 = true;
this.step2 = false; this.step2 = false;
} }
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
}) })
}, },
confirm() { //确认 confirm() { //确认
var password_reg = new RegExp(/^[a-zA-Z0-9]{8,20}$/); //^表示开始 $表示结束 8～20位字母和数字组合 var password_reg = new RegExp(/^[a-zA-Z0-9]{6,20}$/); //^表示开始 $表示结束 6～20位字母和数字组合
if (!this.form.password) { if (!this.form.password) {
this.formError = true; this.formError = true;
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
if (!password_reg.test(this.form.password)) { if (!password_reg.test(this.form.password)) {
this.formError = true; this.formError = true;
this.formMsg = '亲,密码由8～20位字母、数字组合'; this.formMsg = '亲,密码由6～20位字母、数字组合';
return; return;
} }
......
src/views/wallet/Status.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
Vue.use(Icon).use(Dialog); Vue.use(Icon).use(Dialog);
export default { export default {
name: 'status', name: 'walletStatus',
data() { data() {
return { return {
title: "钱包状态", title: "钱包状态",
......
src/views/wallet/WalletDetail.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
Vue.use(Icon).use(Popup).use(DatetimePicker).use(Picker).use(Toast); Vue.use(Icon).use(Popup).use(DatetimePicker).use(Picker).use(Toast);
export default { export default {
name: 'WalletDetail', name: 'walletDetail',
data() { data() {
return { return {
title: "钱包明细", title: "钱包明细",
......
view/19.js
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
/***/ (function(module, __webpack_exports__, __webpack_require__) { /***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict"; "use strict";
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var D_svnData_h5_node_modules_babel_runtime_corejs2_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/@babel/runtime-corejs2/helpers/esm/objectSpread */ \"./node_modules/_@babel_runtime-corejs2@7.3.1@@babel/runtime-corejs2/helpers/esm/objectSpread.js\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.6@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.1.0@vuex/dist/vuex.esm.js\");\n/* harmony import */ var _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @/views/common/Header.vue */ \"./src/views/common/Header.vue\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@1.6.5@vant/es/index.js\");\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_1__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_4__[\"Icon\"]).use(vant__WEBPACK_IMPORTED_MODULE_4__[\"Dialog\"]);\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: 'status',\n data: function data() {\n return {\n title: \"钱包状态\",\n meaushow: true\n };\n },\n computed: Object(D_svnData_h5_node_modules_babel_runtime_corejs2_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__[\"default\"])({}, Object(vuex__WEBPACK_IMPORTED_MODULE_2__[\"mapState\"])({\n walletInfoData: function walletInfoData(state) {\n return state.wallet.walletInfoData;\n }\n })),\n watch: {},\n created: function created() {\n this.$store.dispatch({\n type: 'getWalletInfo'\n });\n },\n methods: {\n dialogTips: function dialogTips() {\n vant__WEBPACK_IMPORTED_MODULE_4__[\"Dialog\"].alert({\n message: '<p style=\"font-size:16px;\">您的' + this.walletInfoData.wallet_freeze_format + '元正在提现中，</p><p style=\"font-size:16px;\">预计1个工作日后到账，</p><p style=\"font-size:16px;\">节假日顺延，请耐心等候。</p>'\n }).then(function () {// on close\n });\n },\n submit: function submit() {\n this.$router.push({\n path: '/wallet/activate'\n });\n },\n forgetPassword: function forgetPassword() {\n this.$router.push({\n path: '/wallet/retrieve'\n });\n },\n bindBank: function bindBank() {\n this.$router.push({\n path: '/wallet/verify'\n });\n }\n },\n components: {\n Header: _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_3__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/wallet/Status.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.5@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.6.4@vue-loader/lib??vue-loader-options"); eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var D_svnData_h5_node_modules_babel_runtime_corejs2_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/@babel/runtime-corejs2/helpers/esm/objectSpread */ \"./node_modules/_@babel_runtime-corejs2@7.3.1@@babel/runtime-corejs2/helpers/esm/objectSpread.js\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.6@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.1.0@vuex/dist/vuex.esm.js\");\n/* harmony import */ var _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @/views/common/Header.vue */ \"./src/views/common/Header.vue\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@1.6.5@vant/es/index.js\");\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_1__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_4__[\"Icon\"]).use(vant__WEBPACK_IMPORTED_MODULE_4__[\"Dialog\"]);\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: 'walletStatus',\n data: function data() {\n return {\n title: \"钱包状态\",\n meaushow: true\n };\n },\n computed: Object(D_svnData_h5_node_modules_babel_runtime_corejs2_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__[\"default\"])({}, Object(vuex__WEBPACK_IMPORTED_MODULE_2__[\"mapState\"])({\n walletInfoData: function walletInfoData(state) {\n return state.wallet.walletInfoData;\n }\n })),\n watch: {},\n created: function created() {\n this.$store.dispatch({\n type: 'getWalletInfo'\n });\n },\n methods: {\n dialogTips: function dialogTips() {\n vant__WEBPACK_IMPORTED_MODULE_4__[\"Dialog\"].alert({\n message: '<p style=\"font-size:16px;\">您的' + this.walletInfoData.wallet_freeze_format + '元正在提现中，</p><p style=\"font-size:16px;\">预计1个工作日后到账，</p><p style=\"font-size:16px;\">节假日顺延，请耐心等候。</p>'\n }).then(function () {// on close\n });\n },\n submit: function submit() {\n this.$router.push({\n path: '/wallet/activate'\n });\n },\n forgetPassword: function forgetPassword() {\n this.$router.push({\n path: '/wallet/retrieve'\n });\n },\n bindBank: function bindBank() {\n this.$router.push({\n path: '/wallet/verify'\n });\n }\n },\n components: {\n Header: _views_common_Header_vue__WEBPACK_IMPORTED_MODULE_3__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/wallet/Status.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.5@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.6.4@vue-loader/lib??vue-loader-options");
/***/ }), /***/ }),
......
view/app.js
...@@ -631,7 +631,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n/ ...@@ -631,7 +631,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n/
/***/ (function(module, __webpack_exports__, __webpack_require__) { /***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict"; "use strict";
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"app\" } },\n [\n _c(\n \"keep-alive\",\n { attrs: { exclude: \"newsDetail,wallet,status\" } },\n [_c(\"router-view\", { staticClass: \"router-view\" })],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/App.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%220ef89de4-vue-loader-template%22%7D!./node_modules/_vue-loader@15.6.4@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.6.4@vue-loader/lib??vue-loader-options"); eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"app\" } },\n [\n _c(\n \"keep-alive\",\n {\n attrs: {\n exclude:\n \"newsDetail,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus\"\n }\n },\n [_c(\"router-view\", { staticClass: \"router-view\" })],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/App.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%220ef89de4-vue-loader-template%22%7D!./node_modules/_vue-loader@15.6.4@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.6.4@vue-loader/lib??vue-loader-options");
/***/ }), /***/ }),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment