Skip to content

U
uni-app-ddh-shop
Commit 4735acca authored by caimeng's avatar caimeng
Browse files
Options

修改提交

parent cde25617
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3111 additions and 3043 deletions
.gitignore
View file @ 4735acca
...@@ -10,6 +10,9 @@ dist/ ...@@ -10,6 +10,9 @@ dist/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
unpackage/
.history
.hbuilderx
# Editor directories and files # Editor directories and files
.project .project
...@@ -22,4 +25,3 @@ yarn-error.log* ...@@ -22,4 +25,3 @@ yarn-error.log*
*.sw* *.sw*
.history .history
.DS_Store .DS_Store
/unpackage
App.vue
View file @ 4735acca
<script> <script>
import { convertPromise ,initHeaderInfo} from './utils/header.js' import { convertPromise ,initHeaderInfo} from './utils/header.js'
import Permission from '@/js_sdk/wa-permission/permission' import Permission from '@/js_sdk/wa-permission/permission'
import { SelectLocation } from "./utils/authPerission"; import { SelectLocation } from "./utils/authPerission";
import silentlyAppUpdate from '@/pages/app-update/js-sdk/silentlyAppUpdate' import silentlyAppUpdate from '@/pages/app-update/js-sdk/silentlyAppUpdate'
export default { export default {
onLaunch: function() { onLaunch: function() {
const common = uni.getStorageSync("m-headers") const common = uni.getStorageSync("m-headers")
if (!common && plus.os.name=='iOS') { if (!common && plus.os.name=='iOS') {
console.log(plus.os.name,'9') this.loadDevice();
this.loadDevice(); this.loadNetwork();
this.loadNetwork(); this.loadLocation();
this.loadLocation(); this.loadUuid()
this.loadUuid() }
} let versionNumber
let versionNumber plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){ if(wgtinfo.version){
versionNumber = wgtinfo.version;
if(wgtinfo.version){ }else{
versionNumber = wgtinfo.version; versionNumber = plus.runtime.version;
}else{ }
versionNumber = plus.runtime.version; uni.setStorageSync('version',versionNumber)
} })
console.log(versionNumber,'versionNumber')
uni.setStorageSync('version',versionNumber)
})
// 强制竖屏
plus.screen.lockOrientation("portrait-primary") plus.screen.lockOrientation("portrait-primary")
/*** tabbar*/ /*** tabbar*/
this.switchShowTabbar() this.switchShowTabbar()
//app更新版本
silentlyAppUpdate() //app更新版本
const isAgree = uni.getStorageSync('m-agreement') // silentlyAppUpdate()
if (isAgree && plus.os.name=='iOS') { const isAgree = uni.getStorageSync('m-agreement')
silentlyAppUpdate() if (isAgree && plus.os.name ==='iOS') {
} silentlyAppUpdate()
// this.getAppVersion() }
console.log('App Launch')
}, },
methods:{ methods:{
getAppVersion(){ getAppVersion(){
const self=this const self=this
uni.getSystemInfo({ uni.getSystemInfo({
success: (res) => { success: (res) => {
let platform = res.platform; let platform = res.platform;
// 获取本机版本号 // 获取本机版本号
let type; let type;
platform === "android" ? (type = "ANDROID") : (type = "IOS"); platform === "android" ? (type = "ANDROID") : (type = "IOS");
self.$request(`/pawn/setting/other/appVersion/${type}`,'GET').then(res => { self.$request(`/pawn/setting/other/appVersion/${type}`,'GET').then(res => {
if (res.success==true) { if (res.success==true) {
let response = res.result.data; let response = res.result.data;
let result = {}; let result = {};
result.versionCode = response.version; result.versionCode = response.version;
result.versionName = response.versionName; result.versionName = response.versionName;
result.versionInfo = response.content || "暂无"; result.versionInfo = response.content || "暂无";
result.forceUpdate = response.forceUpdate; result.forceUpdate = response.forceUpdate;
result.downloadUrl = response.downloadUrl; result.downloadUrl = response.downloadUrl;
result.is_silently = response.is_silently || false; result.is_silently = response.is_silently || false;
result.platform = platform; result.platform = platform;
result.storeList = response.storeList || ''; result.storeList = response.storeList || '';
result.title = response.title || ''; result.title = response.title || '';
result.type = response.type || ''; result.type = response.type || '';
uni.setStorageSync('appVersion-info',result) uni.setStorageSync('appVersion-info',result)
// resolve(result); // resolve(result);
} }
}) })
} }
}); });
}, },
//tab的信息 //tab的信息
switchShowTabbar(){ switchShowTabbar(){
const token=uni.getStorageSync('token') const token=uni.getStorageSync('token')
if (!token) { if (!token) {
console.log(token,'tokentab') uni.setTabBarItem({
uni.setTabBarItem({ index: 1,
index: 1, visible: false
visible: false })
}) } else {
} else { const self=this
const self=this self.$request('/pawn/setting/other/switch/loan','GET').then(res => {
self.$request('/pawn/setting/other/switch/loan','GET').then(res => { const {data}=res.result
const {data}=res.result if (res.code == 200 && data == true) {
if (res.code == 200 && data == true) { try {
try { uni.setTabBarItem({
console.log(data,'显示') index: 1,
uni.setTabBarItem({ text: '贷款',
index: 1, visible: true,
text: '贷款', })
visible: true, } catch (error) {
}) console.log(error);
} catch (error) { }
console.log(error); } else {
} console.log(data,'隐藏')
} else { uni.setTabBarItem({
console.log(data,'隐藏') index: 1,
uni.setTabBarItem({ visible: false
index: 1, })
visible: false }
}) })
} }
})
}
}, },
// 获取common当中的设备信息 // 获取common当中的设备信息
loadDevice: function() { loadDevice: function() {
...@@ -130,7 +125,7 @@ ...@@ -130,7 +125,7 @@
key: 'm-device-info', key: 'm-device-info',
data: JSON.stringify(deviceInfo), data: JSON.stringify(deviceInfo),
success: function() { success: function() {
console.log('m-device-info存储成功'); // console.log('m-device-info存储成功');
} }
}); });
}).catch(err => { }).catch(err => {
...@@ -160,7 +155,7 @@ ...@@ -160,7 +155,7 @@
key: 'm-network-info', key: 'm-network-info',
data: JSON.stringify(networkInfo), data: JSON.stringify(networkInfo),
success: function() { success: function() {
console.log('m-network-info存储成功'); // console.log('m-network-info存储成功');
} }
}); });
}).catch(err => { }).catch(err => {
...@@ -179,7 +174,7 @@ ...@@ -179,7 +174,7 @@
key: 'm-load-udid', key: 'm-load-udid',
data: JSON.stringify(deviceInfo), data: JSON.stringify(deviceInfo),
success: function() { success: function() {
console.log('uuid存储成功'); // console.log('uuid存储成功');
} }
}) })
}, },
...@@ -206,7 +201,7 @@ ...@@ -206,7 +201,7 @@
key: 'm-location-info', key: 'm-location-info',
data: JSON.stringify(locationInfo), data: JSON.stringify(locationInfo),
success: function() { success: function() {
console.log('m-location-info存储成功'); // console.log('m-location-info存储成功');
} }
}); });
}).catch(err => { }).catch(err => {
...@@ -215,19 +210,11 @@ ...@@ -215,19 +210,11 @@
}) })
}) })
} }
},
onShow: function() {
console.log(2,'App Show')
},
onHide: function() {
console.log('App Hide')
} }
} }
</script> </script>
<style > <style >
/*每个页面公共css */ /*每个页面公共css */
</style> </style>
config/api.js
View file @ 4735acca
...@@ -47,8 +47,6 @@ let env = process.env.VUE_APP_BASE_NODE_ENV ...@@ -47,8 +47,6 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
env = "development"; env = "development";
// #endif // #endif
console.log("env", env);
const api = { const api = {
common: BASE[env].common, common: BASE[env].common,
buyer: BASE[env].buyer, buyer: BASE[env].buyer,
......
js_sdk/wa-permission/permission.js
View file @ 4735acca
...@@ -45,7 +45,7 @@ function judgeIosPermissionLocation() { ...@@ -45,7 +45,7 @@ function judgeIosPermissionLocation() {
var cllocationManger = plus.ios.import("CLLocationManager"); var cllocationManger = plus.ios.import("CLLocationManager");
var status = cllocationManger.authorizationStatus(); var status = cllocationManger.authorizationStatus();
result = (status != 2) result = (status != 2)
console.log("定位权限开启：" + result); // console.log("定位权限开启：" + result);
// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation // 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
/* var enable = cllocationManger.locationServicesEnabled(); /* var enable = cllocationManger.locationServicesEnabled();
var status = cllocationManger.authorizationStatus(); var status = cllocationManger.authorizationStatus();
......
pages.json
View file @ 4735acca
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
"bounce": "none" "bounce": "none"
} }
} }
}, },
{ {
"path": "pages/sort/index", "path": "pages/sort/index",
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
} }
} }
} }
], ],
"tabBar": { "tabBar": {
"borderStyle": "white", "borderStyle": "white",
"color": "#BBBBBB", "color": "#BBBBBB",
...@@ -233,5 +233,5 @@ ...@@ -233,5 +233,5 @@
"pages/my/index" "pages/my/index"
], ],
"resToLogin":true "resToLogin":true
} }
} }
pages/agreement/index.less
View file @ 4735acca
page{
background: transparent;
}
.page-agreement{ .page-agreement{
position: relative; position: relative;
width: 100vw; width: 100vw;
......
pages/agreement/index.vue
View file @ 4735acca
...@@ -82,8 +82,7 @@ export default { ...@@ -82,8 +82,7 @@ export default {
const { protocol,phone }=res.result const { protocol,phone }=res.result
if(protocol){ if(protocol){
const protocolList=JSON.parse(protocol) const protocolList=JSON.parse(protocol)
protocolList.map((item)=>{ protocolList.map((item)=>{
console.log(item,'item9')
if(item.protocolName=='隐私协议'){ if(item.protocolName=='隐私协议'){
self.protocols=item self.protocols=item
}else if(item.protocolName=='用户服务协议'){ }else if(item.protocolName=='用户服务协议'){
......
pages/app-update/index.vue
View file @ 4735acca
This diff is collapsed.
pages/app-update/js-sdk/silentlyAppUpdate.js
View file @ 4735acca
...@@ -33,21 +33,19 @@ export const compare = (v1 = '0', v2 = '0') => { ...@@ -33,21 +33,19 @@ export const compare = (v1 = '0', v2 = '0') => {
return result; return result;
} }
export default function silentlyAppUpdate() { export default function silentlyAppUpdate() {
// const checkVersion=uni.getStorageSync('appVersion-info') // const checkVersion=uni.getStorageSync('appVersion-info')
// console.log(checkVersion,'checkVersion') // console.log(checkVersion,'checkVersion')
// plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => { // plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
// if (compare(checkVersion.versionName, wgtinfo.version) === 1) { // if (compare(checkVersion.versionName, wgtinfo.version) === 1) {
// uni.redirectTo({ // uni.redirectTo({
// url: "/pages/app-update/index", // url: "/pages/app-update/index",
// }) // })
// } // }
// }); // });
checkVersion().then(res => { checkVersion().then(res => {
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
if (compare(res.versionName, wgtinfo.version) === 1) { if (compare(res.versionName, wgtinfo.version) === 1) {
uni.redirectTo({ uni.redirectTo({
url: "/pages/app-update/index", url: "/pages/app-update/index",
...@@ -77,7 +75,7 @@ export default function silentlyAppUpdate() { ...@@ -77,7 +75,7 @@ export default function silentlyAppUpdate() {
// }) // })
// } // }
// }); // });
// dtask.start(); // dtask.start();
// } // }
......
pages/index/index.vue
View file @ 4735acca
...@@ -111,8 +111,7 @@ ...@@ -111,8 +111,7 @@
onReady() { onReady() {
const systemInfo = uni.getSystemInfoSync(); const systemInfo = uni.getSystemInfoSync();
if(systemInfo.platform === 'ios'){ if(systemInfo.platform === 'ios'){
const isAgree = uni.getStorageSync('m-agreement') const isAgree = uni.getStorageSync('m-agreement')
console.log(isAgree,'isAgree1')
if (!isAgree) { if (!isAgree) {
console.log(isAgree,'isAgree') console.log(isAgree,'isAgree')
this.Go('uni:/pages/agreement/index') this.Go('uni:/pages/agreement/index')
...@@ -246,31 +245,32 @@ ...@@ -246,31 +245,32 @@
searchGood(){ searchGood(){
const self=this const self=this
const { sort,pageSize,pageNum}=self const { sort,pageSize,pageNum}=self
const params={ const params={
"current":pageNum, "current":pageNum,
"size":pageSize, "size":pageSize,
"sort":sort "sort":sort
} }
console.log(params,'查询商品') console.log(params,'查询商品')
self.$request('/pawn/category/getGoodsPage','POST',params).then(res => { try{
self.$request('/pawn/category/getGoodsPage','POST',params).then(res => {
const {current,total,size,records }=res.result
const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页
if(self.loadFlag){
self.IndexList=self.IndexList.concat(records)
}else{
self.IndexList=records
}
self.hasNextPage=hasNextPage
self.loadFlag=false
}).catch(err=>{
console.log(err,'请求出错')
})
const {current,total,size,records }=res.result }catch{
const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页 console.log(err,'错误信息')
if(self.loadFlag){ }
self.IndexList=self.IndexList.concat(records)
}else{
self.IndexList=records
}
self.hasNextPage=hasNextPage
self.loadFlag=false
}).catch(err=>{
console.log(err,'请求出错')
})
}, },
toupperTop:function(e){ toupperTop:function(e){
console.log(e,'到顶了'); console.log(e,'到顶了');
......
unpackage/dist/dev/app-plus/app-config-service.js
View file @ 4735acca
var isReady=false;var onReadyCallbacks=[]; var isReady=false;var onReadyCallbacks=[];
var isServiceReady=false;var onServiceReadyCallbacks=[]; var isServiceReady=false;var onServiceReadyCallbacks=[];
var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.24","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}}; var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.28","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom","bounce":"none"}},{"path":"/pages/sort/index","meta":{},"window":{"navigationBarTitleText":"款式"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/recruit/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"鉴定师招聘"}},{"path":"/pages/recruitResult/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/category/category","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"选择鉴定品类"}},{"path":"/pages/application/application","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我的鉴定申请"}},{"path":"/pages/myneed/myneed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要的"}},{"path":"/pages/Ineed/Ineed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要"}},{"path":"/pages/productDetails/productDetails","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"商品详情"}},{"path":"/pages/detailResult/detailResult","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/useFeed/useFeed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"用户反馈"}},{"path":"/pages/lookGoods/lookGoods","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/login/login","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"登录"}},{"path":"/pages/prolist/prolist","meta":{},"window":{"navigationBarTitleText":"相关协议"}},{"path":"/pages/setting/setting","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"设置"}},{"path":"/pages/contact/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/web","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/bill/indexs","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/index","meta":{},"window":{"disableScroll":true,"backgroundColorTop":"transparent","background":"transparent","titleNView":false,"scrollIndicator":false,"animationType":"fade-in","animationDuration":200,"disableSwipeBack":true}},{"path":"/pages/agreement/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"","enablePullDownRefresh":false,"bounce":"none","animationType":"fade-in","background":"transparent","backgroundColor":"rgba(0,0,0,0)","webviewBGTransparent":true,"mask":"none"}}]; var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom","bounce":"none"}},{"path":"/pages/sort/index","meta":{},"window":{"navigationBarTitleText":"款式"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/recruit/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"鉴定师招聘"}},{"path":"/pages/recruitResult/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/category/category","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"选择鉴定品类"}},{"path":"/pages/application/application","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我的鉴定申请"}},{"path":"/pages/myneed/myneed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要的"}},{"path":"/pages/Ineed/Ineed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要"}},{"path":"/pages/productDetails/productDetails","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"商品详情"}},{"path":"/pages/detailResult/detailResult","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/useFeed/useFeed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"用户反馈"}},{"path":"/pages/lookGoods/lookGoods","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/login/login","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"登录"}},{"path":"/pages/prolist/prolist","meta":{},"window":{"navigationBarTitleText":"相关协议"}},{"path":"/pages/setting/setting","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"设置"}},{"path":"/pages/contact/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/web","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/bill/indexs","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/index","meta":{},"window":{"disableScroll":true,"backgroundColorTop":"transparent","background":"transparent","titleNView":false,"scrollIndicator":false,"animationType":"fade-in","animationDuration":200,"disableSwipeBack":true}},{"path":"/pages/agreement/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"","enablePullDownRefresh":false,"bounce":"none","animationType":"fade-in","background":"transparent","backgroundColor":"rgba(0,0,0,0)","webviewBGTransparent":true,"mask":"none"}}];
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 4735acca
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 4735acca
This diff is collapsed.
unpackage/dist/dev/app-plus/manifest.json
View file @ 4735acca
This diff is collapsed.
unpackage/dist/dev/app-plus/view.umd.min.js
View file @ 4735acca
This diff is collapsed.
utils/authPerission.js
View file @ 4735acca
...@@ -107,7 +107,7 @@ export const SelectLocation = async function (callback) { ...@@ -107,7 +107,7 @@ export const SelectLocation = async function (callback) {
const platform = uni.getSystemInfoSync(); const platform = uni.getSystemInfoSync();
if (platform.osName === 'ios') { if (platform.osName === 'ios') {
if (Permission.judgeIosPermission('location')) { if (Permission.judgeIosPermission('location')) {
console.log('进入这里了') // console.log('进入这里了')
callback && callback() callback && callback()
} else { } else {
CheckLocationPermission(callback) CheckLocationPermission(callback)
......
utils/device.js 0 → 100644
View file @ 4735acca
import storage from './storage'
import store from '@/store'
import { device } from '@/api/other'
/**
* 设置请求头信息
*/
export function setDevice() {
const info = uni.getSystemInfoSync()
const { appVersion, deviceId, brand, platform, system } = info
let data = {
appKey: 'hhym',
appVersion, // app版本号
deviceId, // 设备号
deviceBrand: brand, // 品牌名称
sourceChannel: store.state.channel,
deviceType: platform, // 设备类型
systemVersion: system, // 系统版本
deviceToken: '', // APP推送标识
iosDeviceToken: '', // iOS推送标识
idfa: '', // 广告标识，iOS必填
mac: '', // mac地址
appPackage: 'com.huahuayoumi.hhym', // APP包名
}
if (platform == 'ios') {
plus.device.getInfo({
//需要勾选IDFA
success: e => {
console.log('getInfo:' + JSON.stringify(e))
return data.idfa = e.idfa
},
fail: err => {
console.log('getDeviceInfo failed: ' + JSON.stringify(err))
},
})
}
// 上传 device系统信息
setTimeout(() => {
try {
device(data).then((res) => {
console.log('res', JSON.stringify(res.data))
})
storage.setDeviceData(data)
} catch (error) {
console.error(error);
}
}, 300)
}
// Android mac地址
function getDeviceMac() {
//获取本机Mac地址
let deviceMac = ''
let net = plus.android.importClass('java.net.NetworkInterface')
let wl0 = net.getByName('wlan0')
let macByte = wl0.getHardwareAddress()
deviceMac = ''
for (let i = 0; i < macByte.length; i++) {
let tmp = ''
let num = macByte[i]
if (num < 0) {
tmp = (255 + num + 1).toString(16)
} else {
tmp = num.toString(16)
}
if (tmp.length == 1) {
tmp = '0' + tmp
}
deviceMac += tmp
}
return deviceMac
}
utils/header.js
View file @ 4735acca
...@@ -16,27 +16,25 @@ export const convertPromise = function (FnName, params = {}) { ...@@ -16,27 +16,25 @@ export const convertPromise = function (FnName, params = {}) {
}) })
}); });
} }
export const initHeaderInfo = function (){ export const initHeaderInfo = function () {
const versionNew=uni.getStorageSync('m-header-version') const versionNew = uni.getStorageSync('m-header-version')
let deviceName let deviceName
if(plus.os.name=='Android'){ if (plus.os.name == 'Android') {
deviceName='android' deviceName = 'android'
}else{ } else {
deviceName='ios' deviceName = 'ios'
} }
console.log(plus.os.name,'plus.os.name') // 根据当前时间戳生成一个随机整数
// 根据当前时间戳生成一个随机整数 var randomNum = new Date().getTime();
var randomNum = new Date().getTime(); const commons = {
const commons={ "appName": "DDH",
"appName":"DDH", "appSourceId": "1",
"appSourceId":"1", "token": randomNum,
"token":randomNum, "device": deviceName,
"device":deviceName, "appVersion": versionNew,
"appVersion":versionNew, }
} return commons
console.log(commons,'commons')
return commons
} }
// 初始化请求头的device参数信息 // 初始化请求头的device参数信息
export const initHeaderDevice = function () { export const initHeaderDevice = function () {
...@@ -59,7 +57,7 @@ export const initHeaderDevice = function () { ...@@ -59,7 +57,7 @@ export const initHeaderDevice = function () {
const deviceInfo = uni.getStorageSync('m-device-info') const deviceInfo = uni.getStorageSync('m-device-info')
const networkInfo = uni.getStorageSync('m-network-info') const networkInfo = uni.getStorageSync('m-network-info')
const locationInfo = uni.getStorageSync('m-location-info') const locationInfo = uni.getStorageSync('m-location-info')
const loadUuid = uni.getStorageSync('m-load-udid') const loadUuid = uni.getStorageSync('m-load-udid')
let device = {}; let device = {};
if (deviceInfo) { if (deviceInfo) {
device = Object.assign(device, common, JSON.parse(deviceInfo)) device = Object.assign(device, common, JSON.parse(deviceInfo))
...@@ -72,15 +70,15 @@ export const initHeaderDevice = function () { ...@@ -72,15 +70,15 @@ export const initHeaderDevice = function () {
if (locationInfo) { if (locationInfo) {
device = Object.assign(device, common, JSON.parse(locationInfo)) device = Object.assign(device, common, JSON.parse(locationInfo))
} }
if(loadUuid){ if (loadUuid) {
device = Object.assign(device, common, JSON.parse(loadUuid)) device = Object.assign(device, common, JSON.parse(loadUuid))
} }
if (deviceInfo && networkInfo && loadUuid) { if (deviceInfo && networkInfo && loadUuid && locationInfo) {
const headerDeviceInfo = { const headerDeviceInfo = {
...JSON.parse(deviceInfo), ...JSON.parse(deviceInfo),
...JSON.parse(networkInfo), ...JSON.parse(networkInfo),
...JSON.parse(locationInfo), ...JSON.parse(locationInfo),
...JSON.parse(loadUuid), ...JSON.parse(loadUuid),
...common ...common
} }
...@@ -89,7 +87,7 @@ export const initHeaderDevice = function () { ...@@ -89,7 +87,7 @@ export const initHeaderDevice = function () {
key: 'm-header-device', key: 'm-header-device',
data: JSON.stringify(headerDeviceInfo), data: JSON.stringify(headerDeviceInfo),
success: function () { success: function () {
console.log('m-header-device存储成功4'); // console.log('m-header-device存储成功4');
} }
}); });
......
utils/request.js
View file @ 4735acca
import {initHeaderDevice,initHeaderInfo} from './header.js' import { initHeaderDevice, initHeaderInfo} from './header.js'
import api from '@/config/api.js' import api from '@/config/api.js'
const request=async(url,type,data)=>{ const request = async (url, type, data) => {
const baseUrl=api.common const baseUrl = api.common
// 这里确保一定是可以获取得到的 // 这里确保一定是可以获取得到的
const headerDevice = uni.getStorageSync('m-header-device') const headerDevice = uni.getStorageSync('m-header-device')
const deviceInfo = uni.getStorageSync('m-device-info') const deviceInfo = uni.getStorageSync('m-device-info')
let rd=null const tokenF = uni.getStorageSync('tokenFinance')
const tokenF=uni.getStorageSync('tokenFinance') let rd = null
if(!deviceInfo || tokenF=='' && plus.os.name!='iOS'){
rd=initHeaderInfo() if (!deviceInfo || tokenF == '' && plus.os.name != 'iOS') {
}else{ rd = initHeaderInfo()
} else {
if (headerDevice) { if (headerDevice) {
rd = headerDevice rd = headerDevice
console.log(rd,'rd1')
} else { } else {
const common = initHeaderDevice() const common = initHeaderDevice()
console.log(common,'日===')
rd = JSON.stringify(common) if (common) {
console.log(rd,'rd2') rd = JSON.stringify(common)
}
} }
} }
console.log(rd,'rd3') return new Promise((resolve, reject) => {
return new Promise((resolve,reject)=>{ const token = uni.getStorageSync('token')
const token=uni.getStorageSync('token') const tokenFinance = uni.getStorageSync('tokenFinance')
const tokenFinance=uni.getStorageSync('tokenFinance')
uni.request({ uni.request({
url: baseUrl+url, url: baseUrl + url,
method:type, method: type,
data: { data: {
...data ...data
}, },
header: { header: {
Accept: "application/json;charset=UTF-8", Accept: "application/json;charset=UTF-8",
"Content-Type": "application/json;charset=UTF-8", "Content-Type": "application/json;charset=UTF-8",
device:rd, device: rd,
Authorization:tokenFinance,//贷超 Authorization: tokenFinance, //贷超
Author:token,//多典花 Author: token, //多典花
}, },
success: (res) => { success: (res) => {
const {data, statusCode} = res; const {
if (statusCode === 200) { data,
if (data.success==true) { statusCode
return resolve(data) } = res;
} else { if (statusCode === 200) {
if(data.code=='403'){ if (data.success == true) {
console.log(res,'402'); return resolve(data)
uni.showToast({ } else {
title: data.message, if (data.code == '403') {
icon: "none", console.log(res, '402');
duration: 2000 uni.showToast({
title: data.message,
}) icon: "none",
uni.removeStorageSync('token') duration: 2000
}else{
uni.showToast({ })
title: data.message, uni.removeStorageSync('token')
icon: "none", } else {
duration: 2000 uni.showToast({
title: data.message,
}) icon: "none",
return false duration: 2000
}
})
return false
}
} }
} else { } else {
console.log(res.errMsg,'!200'); console.log(res.errMsg, '!200');
return reject({ return reject({
data, data,
message: res.errMsg message: res.errMsg
}) })
} }
}, },
fail:(err)=> { fail: (err) => {
console.log(err,954) console.log(err, 954)
// return uni.showToast({ // return uni.showToast({
// icon:'loading', // icon:'loading',
// title:'请求失败' // title:'请求失败'
...@@ -82,7 +86,7 @@ const request=async(url,type,data)=>{ ...@@ -82,7 +86,7 @@ const request=async(url,type,data)=>{
reject(err) reject(err)
} }
}); });
}) })
} }
......
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