Skip to content

H
hls-xcmg-vue-app
Commit 7577ff99 authored by jiacheng.mao's avatar jiacheng.mao
Browse files
Options

驾照类型必填 

去除定位
【猜您喜欢】字样更改
uat4.3.1
prod0.5.0
parent c651cafc
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
config/prod.env.js
View file @ 7577ff99
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"0.4.9"'
currentVersion: '"0.5.0"'
}
config/uat.env.js
View file @ 7577ff99
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"4.2.8"'
currentVersion: '"4.3.1"'
}
src/pages/home/home-page.vue
View file @ 7577ff99
......@@ -8,12 +8,12 @@
<template>
<h-view id="homePage" class="public-style" title="徐工租赁">
<h-header :proportion="[7,10,0]" class="bar-custom">
<div slot="left" class="h-header-btn" @click="location">
<!-- <i class="ion-ios-arrow-back" /> -->
<!--<div slot="left" class="h-header-btn" @click="location">
&lt;!&ndash; <i class="ion-ios-arrow-back" /> &ndash;&gt;
<img class="locations" src="@/assets/homePage/location.png" alt="">
<span class="home-city">{{ city }}</span>
</div>
<div slot="center" @click="getLocation">徐工金服</div>
</div>-->
<div slot="center">徐工金服</div>
</h-header>
<h-content class="has-footer">
<div class="top-wrap"/>
......@@ -52,7 +52,7 @@
<img src="@/assets/homePage/copy3.png" alt="">
</div>
</div>
<div class="guessing">猜你喜欢<span><img src="@/assets/homePage/intrest.png"></span></div>
<div class="guessing">产品列表<span><img src="@/assets/homePage/intrest.png"></span></div>
<div v-for="(list,index) in guessingList" :key="index" class="guessing-wrap" @click="goProductDetail(list)">
<list-item :item-height="120">
<item>
......@@ -110,15 +110,15 @@ export default {
}
// vm.guessingQuery() // 猜你喜欢查询
vm.isVisitor = !window.localStorage.getItem('password')
// vm.guessingQuery() // 猜你喜欢查询
vm.getLocation()
vm.guessingQuery() // 猜你喜欢查询
// vm.getLocation()
vm.getNews()
// }
})
},
methods: {
// 定位
getLocation () {
/* getLocation () {
let vm = this
// if (vum.Platform.isAndroid()) { // 安卓采用jsapi
// var geolocation = new BMap.Geolocation()
......@@ -157,7 +157,7 @@ export default {
}, function (error) {
})
// setTimeout(vm.guessingQuery(), 0)
},
}, */
goFunctionHome (data) {
this.$router.push({
name: data.functionState,
......@@ -195,7 +195,7 @@ export default {
})
}
},
location () {
/* location () {
this.$router.push({
name: 'Location',
params: {
......@@ -203,7 +203,7 @@ export default {
city: this.city,
},
})
},
}, */
gotoNews () {
this.$router.push({
name: 'NewsList',
......@@ -235,17 +235,16 @@ export default {
this.bp_id = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
},
// 猜你喜欢
guessingQuery (e) {
console.log(e)
guessingQuery () {
let vm = this
let url = $config.basePath + 'guess_you_like_query'
let param = {
'user_phone': window.localStorage.getItem('user_phone'),
'city': e,
// 'city': e,
}
vm.hlsPopup.showLoading('数据加载中')
// vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.guessingList = res.lists
vm.guessingList.forEach(item => {
......
src/pages/login.vue
View file @ 7577ff99
......@@ -143,11 +143,11 @@ export default {
window.localStorage.setItem('app_user_id', res.info.app_user_id)
// vm.$router.push('tab')
vm.$router.push('/choose-user')
let tagOption = {
/* let tagOption = {
'username': isNaN(Number(vm.username)) ? '11111111111' : vm.username,
}
let phone = isNaN(Number(vm.username)) ? '11111111111' : vm.username
vm.Jpush._jpush_config(tagOption, phone)
vm.Jpush._jpush_config(tagOption, phone) */
} else {
hlsPopup.hideLoading()
hlsPopup.showLongCenter(res.message)
......
src/pages/userBindNew/np/base-info.vue
View file @ 7577ff99
......@@ -1194,6 +1194,8 @@ export default {
vm.hlsPopup.showLongCenter('业务办理市不能为空！')
} else if (!vm.baseInfo.capital.trim()) {
vm.hlsPopup.showLongCenter('资产信息不能为空！')
} else if (!vm.baseInfo.driving_license_type) {
vm.hlsPopup.showLongCenter('驾照类型不能为空！')
} else if (!vm.baseInfo.academic_background) {
vm.hlsPopup.showLongCenter('学历不能为空！')
} else if (!vm.baseInfo.marital_status && (((vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') && !vm.multipleRole) || vm.multipleRole === 'TENANT' || vm.multipleRole === 'GUTA')) {
......
www/index.html
View file @ 7577ff99
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.fb52dd271f35e6cb942abb94eb5f18bb.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.eecb7fb2ed3197255ab9.js></script><script type=text/javascript src=./static/js/vendor.b2b00151a0abc83a0b0e.js></script><script type=text/javascript src=./static/js/app.e26975a330778662748a.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.fb52dd271f35e6cb942abb94eb5f18bb.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.346662bf21424ef59709.js></script><script type=text/javascript src=./static/js/vendor.b2b00151a0abc83a0b0e.js></script><script type=text/javascript src=./static/js/app.e26975a330778662748a.js></script></body></html>
\ No newline at end of file
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 to comment