diff --git a/config/index.js b/config/index.js
index b912637..bdf8326 100644
--- a/config/index.js
+++ b/config/index.js
@@ -8,7 +8,7 @@ module.exports = {
dev: {
// Paths
- assetsSubDirectory: 'static',
+ assetsSubDirectory: 'select',
assetsPublicPath: '/',
proxyTable: {},
// proxyTable: {
@@ -48,11 +48,11 @@ module.exports = {
build: {
// Template for index.html
- index: path.resolve(__dirname, '../dist/index.html'),
+ index: path.resolve(__dirname, '../select/select.html'),
// Paths
- assetsRoot: path.resolve(__dirname, '../dist'),
- assetsSubDirectory: 'static',
+ assetsRoot: path.resolve(__dirname, '../select'),
+ assetsSubDirectory: 'select',
assetsPublicPath: './',
/**
diff --git a/index.html b/index.html
index e0f2bef..d66ae53 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
- 小票码扫码支付
+ 扫码支付
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index db2dd58..d894e35 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -422,26 +422,26 @@ export default {
font-weight: bold;
li:first-child {
width: 150px;
- &.carBlue {
- background: url("../assets/images/carBlue.png") no-repeat 90px center;
- background-size: 28px 17px;
- }
- &.carYellow {
- background: url("../assets/images/carYellow.png") no-repeat 90px center;
- background-size: 28px 17px;
- }
- &.carGreen {
- background: url("../assets/images/carGreen.png") no-repeat 90px center;
- background-size: 28px 17px;
- }
- &.carWhite {
- background: url("../assets/images/carWhite.png") no-repeat 90px center;
- background-size: 28px 17px;
- }
- &.carBlack {
- background: url("../assets/images/carBlack.png") no-repeat 90px center;
- background-size: 28px 17px;
- }
+ /*&.carBlue {*/
+ /*background: url("../assets/images/carBlue.png") no-repeat 90px center;*/
+ /*background-size: 28px 17px;*/
+ /*}*/
+ /*&.carYellow {*/
+ /*background: url("../assets/images/carYellow.png") no-repeat 90px center;*/
+ /*background-size: 28px 17px;*/
+ /*}*/
+ /*&.carGreen {*/
+ /*background: url("../assets/images/carGreen.png") no-repeat 90px center;*/
+ /*background-size: 28px 17px;*/
+ /*}*/
+ /*&.carWhite {*/
+ /*background: url("../assets/images/carWhite.png") no-repeat 90px center;*/
+ /*background-size: 28px 17px;*/
+ /*}*/
+ /*&.carBlack {*/
+ /*background: url("../assets/images/carBlack.png") no-repeat 90px center;*/
+ /*background-size: 28px 17px;*/
+ /*}*/
}
li:last-child {
margin-right: 18px;
diff --git a/src/components/plateNumber.vue b/src/components/plateNumber.vue
index ccd7fd8..e72bda2 100644
--- a/src/components/plateNumber.vue
+++ b/src/components/plateNumber.vue
@@ -1,55 +1,63 @@
-
请选择车牌颜色
-
- -
- {{i.name}}
-
+
+
请选择车牌颜色
-
+
+ -
+ {{i.name}}
+
- 请输入车牌号码
-
-
- {{formData.num0}}
-
-
{{formData.num1}}
-
-
{{formData.num2}}
-
{{formData.num3}}
-
{{formData.num4}}
-
{{formData.num5}}
-
{{formData.num6}}
-
{{formData.num7}}
+
+
+
请输入车牌号码
+
+
+ {{formData.num0}}
+
+
{{formData.num1}}
+
+
{{formData.num2}}
+
{{formData.num3}}
+
{{formData.num4}}
+
{{formData.num5}}
+
{{formData.num6}}
+
{{formData.num7}}
+
+
+
+
@@ -295,10 +303,12 @@ export default {
id:'5'
},
],
+ username:'',
currentColor:0,
activeBG:'#0054C0',
formData: {
commonCard: '1',
+ sgFlage:1,
num0: '',
num1: '',
num2: '',
@@ -349,6 +359,11 @@ export default {
},
chooseColor (index){ // 颜色选择
this.currentColor = index
+ if(index == 4){
+ this.formData.commonCard = 2
+ }else{
+ this.formData.commonCard = 1
+ }
switch (this.currentColor) {
case 0 :
return this.activeBG = '#0054C0'
@@ -363,6 +378,7 @@ export default {
return this.activeBG = '#333333'
break;
case 4 :
+
return this.activeBG = '#97DEA1'
break;
}
@@ -418,30 +434,38 @@ export default {
this.formData['num' + this.activeKeyWordIndex] = ''
},
submitFn () {
- let plateLicense
- if (this.formData.commonCard === '1') {
- plateLicense = this.plate_license_1
- plateLicense = this.palindrome(plateLicense)
- if (plateLicense.length < 7) {
- this.$refs.alert.open()
- return
+ var plateLicense
+ if(this.formData.sgFlage==1){
+ // alert(this.formData.commonCard)
+ if (this.formData.commonCard == '1') {
+ plateLicense = this.plate_license_1
+ plateLicense = this.palindrome(plateLicense)
+ if (plateLicense.length < 7) {
+ this.$refs.alert.open()
+ return
+ }
}
- }
- if (this.formData.commonCard === '2') {
- plateLicense = this.plate_license_2
- plateLicense = this.palindrome(plateLicense)
- if (plateLicense.length < 8) {
- this.$refs.alert.open()
- return
+ if (this.formData.commonCard == '2') {
+ // alert('2')
+ plateLicense = this.plate_license_2
+ plateLicense = this.palindrome(plateLicense)
+ console.log(plateLicense)
+ if (plateLicense.length < 8) {
+ this.$refs.alert.open()
+ return
+ }
}
+ this.$emit('getPlateLicense',plateLicense)
+ console.log(plateLicense);
+ }else{
+ plateLicense = this.username
}
- this.$emit('getPlateLicense',plateLicense)
- console.log(plateLicense);
+ console.log(plateLicense)
this.$router.push({
path:'parkRecord',
query:{
carNumber:plateLicense,
- carNumberColor: this.currentColor
+ carNumberColor: 0
}
})
},
diff --git a/src/main.js b/src/main.js
index d39c701..d363d76 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,10 @@ Vue.prototype.$utils = utils
import 'mint-ui/lib/style.css'
import { MessageBox } from 'mint-ui'
+
+import { Field } from 'mint-ui';
+
+Vue.component(Field.name, Field);
// Vue.use(MessageBox)
Vue.prototype.$msgbox = MessageBox
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1d6fc36..30121c5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -128,7 +128,7 @@ export default {
// 微信赤峰 appid wx2af2bab90d433c86
// 黄石 appid wxa1a66cc7d263afe6
- myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079
+ myOrgId: '10007', // 归属地 赤峰id 10003 黄石 10079
myGetSign: function (objb) { // 获取签名
var compare = function (obj1, obj2) {