Skip to content

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

旧sdk的ios分支

parent c967d4e5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 452 additions and 444 deletions
config.xml
View file @ 62f6ca6c
......@@ -12,6 +12,8 @@
<access launch-external="yes" origin="mailto:*" />
<access launch-external="yes" origin="tel:*" />
<access launch-external="yes" origin="https://sign-pub.qsign.com.cn/*" />
<access launch-external="yes" origin="https://sign-test.qsign.com.cn/*" />
<access launch-external="yes" origin="https://www.xcmgfs.com/*" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="mailto:*" />
......@@ -25,6 +27,8 @@
<allow-navigation href="https://docs.jiguang.cn/*" />
<allow-navigation href="https://www.rongcloud.cn/*" />
<allow-navigation href="https://sign-pub.qsign.com.cn/*" />
<allow-navigation href="https://sign-test.qsign.com.cn/*" />
<allow-navigation href="https://www.xcmgfs.com/*" />
<access launch-external="yes" origin="tel:*" />
<access launch-external="yes" origin="sms:*" />
<preference name="ScrollEnabled" value="false" />
......
config/dev.env.js
View file @ 62f6ca6c
......@@ -5,11 +5,12 @@ module.exports = {
debug: true,
isMobilePlatform: true,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
privacyPath: '"http://180.104.121.66:8090/html/PrivacyPolicy.html"',
appId: '"com.xcmg.app.dev"',
currentVersion: '"3.7.8"'
currentVersion: '"4.3.1"'
}
config/prod.env.js
View file @ 62f6ca6c
......@@ -10,6 +10,7 @@ module.exports = {
filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
privacyPath: '"http://www.xcmgfs.com:8087/html/PrivacyPolicy.html"',
appId: '"com.xcmg.app"',
currentVersion: '"0.5.0"'
}
config/uat.env.js
View file @ 62f6ca6c
......@@ -10,6 +10,7 @@ module.exports = {
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
privacyPath: '"http://180.104.121.66:8090/html/PrivacyPolicy.html"',
appId: '"com.xcmg.app.dev"',
currentVersion: '"4.3.1"'
}
src/assets/myInfo/zzq_sy.jpg 0 → 100755
View file @ 62f6ca6c
This diff is collapsed.
src/main.js
View file @ 62f6ca6c
......@@ -59,14 +59,14 @@ import hlsUtil from './scripts/hlsUtil'
/**
* jpush jmessage
*/
import Jpush from './scripts/jpushService'
// import Jpush from './scripts/jpushService'
import Jmessage from './scripts/jmessageService'
// import Jmessage from './scripts/jmessageService'
// || process.env.CONFIG_ENV === 'prod'
if (process.env.CONFIG_ENV === 'uat') {
const VConsole = require('vconsole')
new VConsole() // eslint-disable-line
}else if(process.env.CONFIG_ENV === 'dev'){
} else if (process.env.CONFIG_ENV === 'dev') {
const VConsole = require('vconsole')
new VConsole() // eslint-disable-line
}
......@@ -107,9 +107,9 @@ Vue.prototype.PDFJS = window.PDFJS = PDFJS
Vue.prototype.hlsUtil = window.hlsUtil = hlsUtil
Vue.prototype.Jpush = window.Jpush = Jpush
// Vue.prototype.Jpush = window.Jpush = Jpush
Vue.prototype.Jmessage = window.Jmessage = Jmessage
// Vue.prototype.Jmessage = window.Jmessage = Jmessage
/**
* 全局返回上一页面
......@@ -129,12 +129,13 @@ Vue.config.productionTip = false
let backButtonPressedOnceToExit
vum.$vumPlatform.ready(function () {
if (window.localStorage.isReadPolicy === 'true') {
vum.$vumPlatform.ready(function () {
if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
/* window.getRegistrationID = function (callback){
callback('')
} */
try {
/* try {
setTimeout(function () {
navigator.splashscreen.hide()
if (window.plugins.jPushPlugin) {
......@@ -145,7 +146,7 @@ vum.$vumPlatform.ready(function () {
}
}, 40)
} catch (e) {
}
} */
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
cordova.plugins.Keyboard.disableScroll(true)
......@@ -164,7 +165,8 @@ vum.$vumPlatform.ready(function () {
window.localStorage.setItem('height', winSize.height)
}
}
})
})
}
vum.$vumPlatform.registerBackButtonAction(function (e) {
// let vm = this
......
src/pages/home/location.vue
View file @ 62f6ca6c
......@@ -111,7 +111,7 @@ export default {
// console.log(error)
// }, {enableHighAccuracy: true})
// } else { // ios使用插件定位
baidumap_location.getCurrentPosition(function (result) {
/* baidumap_location.getCurrentPosition(function (result) {
console.log('*********** ' + JSON.stringify(result))
window.localStorage.setItem('province', result.province)
window.localStorage.setItem('city', result.city)
......@@ -122,7 +122,7 @@ export default {
vm.province_flag = true
}, function (error) {
console.log('errorerrorerrorerror ' + error)
})
}) */
// }
},
......
src/pages/login.vue
View file @ 62f6ca6c
<template>
<h-content id="login">
<scroll id="login">
<transition name="trans">
<div v-show="downNum" class="modal-show">
<div class="down">
......@@ -11,27 +11,27 @@
</div>
</div>
</transition>
<div class="bird-icon"/>
<div class="bird-icon" />
<div class="login-wrap">
<img class="title" src="../assets/login/right-title.png">
<img class="title" src="../assets/login/right-title.png" >
<div class="pwd">
<div class="pwd-input">
<input
id="userInput" v-model="username" class="user" type="text"
placeholder="请输入用户名/手机号">
id="userInput" v-model.trim="username" class="user" type="text"
placeholder="请输入用户名/手机号" >
</div>
<div v-if="username" class="delete" @click="clearAccount">
<img src="../assets/login/login-delete.png">
<img src="../assets/login/login-delete.png" >
</div>
</div>
<div class="pwd">
<div class="pwd-input">
<input
id="passwordInput" v-model="password" :type="pwdType" placeholder="请输入密码"
oninput="value=value.replace(/[^\w\.\&\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')">
oninput="value=value.replace(/[^\w\.\&\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')" >
</div>
<div v-if="password" class="delete" @click="changeType">
<img :src="openEye">
<img :src="openEye" >
</div>
</div>
<div class="other-function">
......@@ -44,9 +44,12 @@
</div>
</div>
</h-content>
</scroll>
</template>
<script>
// import Jpush from "../scripts/jpushService";
// import Jmessage from "../scripts/jmessageService";
var CryptoJS = require('crypto-js')
export default {
data () {
......@@ -103,13 +106,10 @@ export default {
},
methods: {
async goHome () {
this.hlsPopup.showLoading('请稍等')
let flag = await this.getAccessToken()
this.hlsPopup.hideLoading()
if (flag) {
this.$router.push({
name: 'HomePage',
})
// this.initJPush()
this.$router.push('tab')
}
},
changeType () {
......@@ -142,14 +142,8 @@ export default {
if (res.result === 'S' && res.info.login_flag === 'Y') {
vm.hlsPopup.hideLoading()
// vm.updateVersion() // 版本更新
window.localStorage.setItem('user_phone', vm.username)
window.localStorage.setItem('password', md5passwprd)
// vm.$router.push({
// name: 'HomePage',
// })
vm.$router.push('/choose-user')
window.localStorage.setItem('user_phone', vm.username)
window.localStorage.setItem('app_user_id', res.info.app_user_id)
// vm.$router.push('tab')
vm.$router.push('/choose-user')
......@@ -308,6 +302,46 @@ export default {
},
})
},
/* initJPush () {
if (window.localStorage.isReadPolicy === 'true') {
vum.$vumPlatform.ready(function () {
if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
/!* window.getRegistrationID = function (callback){
callback('')
} *!/
try {
setTimeout(function () {
navigator.splashscreen.hide()
if (window.plugins.jPushPlugin) {
Jpush._init()
}
if (window.JMessagePlugin) {
Jmessage._init({'isOpenMessageRoaming': true})
}
}, 40)
} catch (e) {
}
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
cordova.plugins.Keyboard.disableScroll(true)
}
if (window.StatusBar) {
window.StatusBar.styleDefault()
window.StatusBar.backgroundColorByName('white')
}
const winSize = vum.$vumPlatform.getWinSize()
if (winSize.width) {
window.localStorage.setItem('width', winSize.width)
}
if (winSize.height) {
window.localStorage.setItem('height', winSize.height)
}
}
})
}
}, */
},
}
</script>
......@@ -317,13 +351,11 @@ export default {
.trans-leave-active {
transition: opacity 0.5s;
}
.trans-enter,
.trans-leave-active {
opacity: 0;
}
#login {
#login {
background: url("../assets/login/back.png") no-repeat;
background-size: 100% 100%;
background-position-x: 0px;
......@@ -331,13 +363,11 @@ export default {
width: 100%;
height: 100%;
margin: 0 auto;
.scrollContent {
display: flex;
justify-content: center;
align-items: center;
}
.modal-show {
width: 100%;
height: 100%;
......@@ -347,18 +377,16 @@ export default {
background-color: rgba(56, 63, 69, 0.3);
justify-content: center;
align-items: center;
.policy {
width: 80%;
height: 90%;
margin: 0 auto;
.policy{
width:80%;
height:90%;
margin:0 auto;
display: flex;
justify-content: center;
flex-direction: column;
flex-wrap: wrap;
align-items: center;
}
.down {
position: relative;
width: 301px;
......@@ -370,7 +398,6 @@ export default {
background-size: 301px 24.7px;
background-color: #fff;
border-radius: 8px;
p {
font-family: PingFangSC-Semibold;
font-size: 16px;
......@@ -378,7 +405,6 @@ export default {
margin-top: 16px;
flex: 2;
}
span {
font-family: PingFangSC-Regular;
font-size: 14px;
......@@ -389,7 +415,6 @@ export default {
letter-spacing: 0;
// margin-top: 6px;
}
button {
width: 159px;
flex: 2;
......@@ -403,13 +428,11 @@ export default {
}
}
}
.bird-icon {
padding-top: 30%;
background: url("../assets/login/right.png") 90% no-repeat;
background-size: 51px 25px;
}
.login-wrap {
width: 87%;
height: 355px;
......@@ -419,45 +442,37 @@ export default {
// margin-top: 15%;
margin-top: 6%;
padding: 32px 24px;
.title {
width: 227px;
height: 71px;
margin-left: -10px;
}
}
.pwd {
position: relative;
width: 279px;
margin: 0 auto;
display: flex;
display: -webkit-flex;
.pwd-icon {
margin-top: 2px;
margin-right: 6px;
margin-left: 4px;
img {
width: 18px;
height: 20px;
}
}
.pwd-input {
width: 100%;
.user {
background: url("../assets/login/phone.png") 2px 2px no-repeat;
background-size: 25px 25px;
}
#passwordInput {
background: url("../assets/login/passwordConfirm.png") 2px 2px no-repeat;
background-size: 25px 25px;
}
input {
width: 100%;
text-indent: 30px;
......@@ -470,27 +485,23 @@ export default {
align-items: center;
border-bottom: 1px solid rgba(42, 42, 42, 0.4);
margin-top: 30px;
border-top: 1px solid #FFF;
border-top:1px solid #FFF;
border-left: 1px solid #FFF;
border-right: 1px solid #FFF;
}
input:focus {
border-bottom: 1px solid #1d3fff;
}
input::-webkit-input-placeholder {
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(75, 74, 75, 0.4);
}
}
.delete {
position: absolute;
right: -15px;
top: 30px;
img {
margin-right: 20px;
margin-top: 5px;
......@@ -499,7 +510,6 @@ export default {
}
}
}
.other-function {
width: 279px;
margin: 0 auto;
......@@ -513,12 +523,10 @@ export default {
justify-content: space-between;
-webkit-justify-content: space-between;
}
.both-button {
.both-button{
display: flex;
justify-content: space-around;
}
.submit {
background: #1d3fff;
border-radius: 4px;
......@@ -533,13 +541,11 @@ export default {
-webkit-justify-content: center;
align-items: center;
-webkit-align-items: center;
&.activated {
opacity: 0.8;
-webkit-transform: scale(1, 1);
transform: scale(1, 1);
}
}
.connect {
height: 100%;
}
......
src/pages/myInfo/PrivacyPolicy.vue
View file @ 62f6ca6c
This diff is collapsed.
src/pages/myInfo/business-license.vue 0 → 100644
View file @ 62f6ca6c
<template>
<h-view class="businessLicense public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn" @click="$routeGo()">
<img src="@/assets/userBind/arrow.png">
<span>营业执照</span>
</div>
</h-header>
<h-content>
<div class="license">
<img src="../../assets/myInfo/yyzz_sy.jpg" style="width:100%;">
</div>
</h-content>
</h-view>
</template>
<script>
export default {
components: {},
data () {
return {}
},
}
</script>
<style lang="less">
.businessLicense {
.content {
padding: 15px;
.title {
font-weight: 500;
text-indent: 0px;
}
}
.license{
}
}
</style>
src/pages/myInfo/related-licenses.vue 0 → 100644
View file @ 62f6ca6c
<template>
<h-view id="relatedLicenses" class="public-style" title="相关许可证">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn" @click="$routeGo()">
<img src="@/assets/userBind/arrow.png">
<span>相关许可证</span>
</div>
</h-header>
<h-content>
<div class="relatedLicenses">
<list-item :item-height="50" class="list">
<item @click.native="businessLicense()">
<div slot="name" style="color:#656464;">营业执照</div>
<div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
</item>
</list-item>
<list-item :item-height="50" class="list">
<item>
<div slot="name" style="color:#656464;">苏ICP备2023042290号-2A</div>
</item>
</list-item>
</div>
</h-content>
</h-view>
</template>
<script>
export default {
components: {},
data () {
return {}
},
methods: {
businessLicense () {
this.$router.push({
name: 'BusinessLicense',
})
},
},
}
</script>
<style lang="less">
#relatedLicenses{
.content{
margin-top:0 ;
}
.arrow_right {
display: flex;
align-items: center;
img {
height: 20px;
}
}
}
</style>
src/pages/myInfo/setting.vue
View file @ 62f6ca6c
......@@ -11,7 +11,7 @@
<list-item :item-height="66" class="list">
<item @click.native="imgUploadShow(app_user_id)">
<div slot="name" style="color:#656464;">修改头像</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
<div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
</item>
</list-item>
<list-item :item-height="50" class="list">
......@@ -21,11 +21,11 @@
</item> -->
<item v-if="user_bp_type!='MANAGER'" @click.native="changeRole()">
<div slot="name" style="color:#656464;">角色切换</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
<div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
</item>
<item v-if="user_bp_type!='MANAGER'" @click.native="resetPwd()">
<div slot="name" style="color:red;">修改密码</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
<div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
</item>
<item @click.native="updateVersion()">
<div slot="name" style="color:#656464;width:100%;display:flex;white-space:nowrap;align-items:center;">版本更新&nbsp;&nbsp;&nbsp;
......@@ -33,6 +33,14 @@
</div>
<div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
</item>
<item @click.native="relatedLicenses()">
<div slot="name" style="color:#656464;width:100%;display:flex;white-space:nowrap;align-items:center;">相关许可证</div>
<div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
</item>
<item @click.native="unRegiester()">
<div slot="name" style="color:red;">注销账号</div>
<div class="arrow_right"><img src="@/assets/myInfo/exit.png"></div>
</item>
<!-- <item v-if="user_bp_type!='MANAGER'" @click.native="unBind()">
<div slot="name" style="color:#656464;">解除绑定</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
......@@ -586,6 +594,48 @@ export default {
hlsPopup.hideLoading()
}
},
unRegiester () {
let vm = this
hlsPopup.showConfirm({
title: '提示',
content: '确认注销？',
onConfirm: function (index) {
if (index === 1) {
let phone = window.localStorage.getItem('user_phone') ? window.localStorage.getItem('user_phone') : ''
if (!phone) return hlsPopup.showLongCenter('当前用户未绑定手机号,无法注销!')
let url = process.env.basePath + 'app_user_delete'
let params = {
phone: phone,
}
hlsHttp.post(url, params).then(function (res) {
if (res.result === 'S') {
hlsPopup.showLongCenter('注销成功')
setTimeout(function () {
let width = window.localStorage.getItem('width')
let height = window.localStorage.getItem('height')
if (window.localStorage.isReadPolicy === 'false') {
window.localStorage.clear()
} else if (window.localStorage.isReadPolicy === 'true') {
window.localStorage.clear()
window.localStorage.setItem('isReadPolicy', true)
} else {
window.localStorage.clear()
}
window.localStorage.setItem('width', width)
window.localStorage.setItem('height', height)
vm.$router.push('/login')
}, 100)
}
})
}
},
})
},
relatedLicenses () {
this.$router.push({
name: 'RelatedLicenses',
})
},
},
}
</script>
......
src/router/index.js
View file @ 62f6ca6c
......@@ -142,6 +142,8 @@ const Addundertake = resolve => require.ensure([], () => { resolve(require('@/pa
const About = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/About')) }, 'myInfo')
const ContactUs = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/ContactUs')) }, 'myInfo')
const Setting = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/setting')) }, 'myInfo')
const RelatedLicenses = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/related-licenses')) }, 'myInfo')
const BusinessLicense = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/business-license')) }, 'myInfo')
const UserAgree = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/UserAgreement')) }, 'myInfo')
const PrivacyPolicy = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/PrivacyPolicy')) }, 'myInfo')
......@@ -373,6 +375,18 @@ export default new Router({
name: 'Setting',
meta: { keepAlive: false },
},
{
path: '/RelatedLicenses',
component: RelatedLicenses,
name: 'RelatedLicenses',
meta: { keepAlive: false },
},
{
path: '/BusinessLicense',
component: BusinessLicense,
name: 'BusinessLicense',
meta: { keepAlive: false },
},
{
path: '/UserAgree',
component: UserAgree,
......
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