Skip to content

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

修改提交

parent cde25617
Show 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
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
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();
...@@ -15,28 +14,26 @@ ...@@ -15,28 +14,26 @@
} }
let versionNumber let versionNumber
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){ plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){
if(wgtinfo.version){ if(wgtinfo.version){
versionNumber = wgtinfo.version; versionNumber = wgtinfo.version;
}else{ }else{
versionNumber = plus.runtime.version; versionNumber = plus.runtime.version;
} }
console.log(versionNumber,'versionNumber')
uni.setStorageSync('version',versionNumber) uni.setStorageSync('version',versionNumber)
}) })
// 强制竖屏
plus.screen.lockOrientation("portrait-primary") plus.screen.lockOrientation("portrait-primary")
/*** tabbar*/ /*** tabbar*/
this.switchShowTabbar() this.switchShowTabbar()
//app更新版本 //app更新版本
silentlyAppUpdate() // silentlyAppUpdate()
const isAgree = uni.getStorageSync('m-agreement') const isAgree = uni.getStorageSync('m-agreement')
if (isAgree && plus.os.name=='iOS') { if (isAgree && plus.os.name ==='iOS') {
silentlyAppUpdate() silentlyAppUpdate()
} }
// this.getAppVersion()
console.log('App Launch')
}, },
methods:{ methods:{
getAppVersion(){ getAppVersion(){
...@@ -75,7 +72,6 @@ ...@@ -75,7 +72,6 @@
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
...@@ -86,7 +82,6 @@ ...@@ -86,7 +82,6 @@
const {data}=res.result const {data}=res.result
if (res.code == 200 && data == true) { if (res.code == 200 && data == true) {
try { try {
console.log(data,'显示')
uni.setTabBarItem({ uni.setTabBarItem({
index: 1, index: 1,
text: '贷款', text: '贷款',
...@@ -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,14 +210,6 @@ ...@@ -215,14 +210,6 @@
}) })
}) })
} }
},
onShow: function() {
console.log(2,'App Show')
},
onHide: function() {
console.log('App Hide')
} }
} }
</script> </script>
......
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/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
...@@ -83,7 +83,6 @@ export default { ...@@ -83,7 +83,6 @@ export default {
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
<template> <template>
<view class="appUploadAlertBox"> <view class="appUploadAlertBox">
<uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx" border-radius="10"> <uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx"
<view class="content_popup" :style="{backgroundColor: bgColor}"> border-radius="10">
<view class="content_popup" :style="{ backgroundColor: bgColor }">
<!-- 关闭app type="closeempty" size="32" <!-- 关闭app type="closeempty" size="32"
color="#ff0000"--> color="#ff0000"-->
<view v-if="!isForceUpdata" class="close" @click="closeUpdate">暂不更新</view> <view v-if="!isForceUpdata" class="close" @click="closeUpdate">暂不更新</view>
<!-- 版本提示 --> <!-- 版本提示 -->
<view class="version" :style="{color: versionColor}">v{{version}}</view> <view class="version" :style="{ color: versionColor }">v{{ version }}</view>
<!-- 背景 --> <!-- 背景 -->
<image class="backgroundImg" width="100%" height="100%" src="./img/appUploadAlertBoxBg.png"></image> <image class="backgroundImg" width="100%" height="100%" src="./img/appUploadAlertBoxBg.png"></image>
<!-- 更新详细信息 --> <!-- 更新详细信息 -->
<view class="info center"> <view class="info center">
<text class="title" :style="{color: titleColor}">{{title}}</text> <text class="title" :style="{ color: titleColor }">{{ title }}</text>
<!-- 更新内容 --> <!-- 更新内容 -->
<scroll-view class="info_desc_scroll" :style="{color: contentColor}" scroll-y="true"> <scroll-view class="info_desc_scroll" :style="{ color: contentColor }" scroll-y="true">
<rich-text :nodes="content"></rich-text> <rich-text :nodes="content"></rich-text>
</scroll-view> </scroll-view>
</view> </view>
<view class="footer" v-if="platform"> <view class="footer" v-if="platform">
<button v-if="downloadSuccess && !wgtInstalled" class="btn" :style="btnStyle" <button v-if="downloadSuccess && !wgtInstalled" class="btn" :style="btnStyle"
@click="installPackage" :loading="wgtInstalling" :disabled="wgtInstalling"> @click="installPackage" :loading="wgtInstalling" :disabled="wgtInstalling">
{{wgtInstalling ? wgtInstallingText : downloadSuccessText}} {{ wgtInstalling ? wgtInstallingText : downloadSuccessText }}
</button> </button>
<button v-else-if="wgtInstalled && isWGT" class="btn" :style="btnStyle" @click="restart"> <button v-else-if="wgtInstalled && isWGT" class="btn" :style="btnStyle" @click="restart">
{{wgtInstalledText}} {{ wgtInstalledText }}
</button> </button>
<!-- 更新进度 --> <!-- 更新进度 -->
<view class="progress-box flex f-c f-y-c" :style="{color: progressTextColor}" <view class="progress-box flex f-c f-y-c" :style="{ color: progressTextColor }"
v-else-if="downloading"> v-else-if="downloading">
<progress class="progress" :percent="downLoadPercent" :activeColor="progressColor || themeColor" <progress class="progress" :percent="downLoadPercent" :activeColor="progressColor || themeColor"
show-info stroke-width="10" /> show-info stroke-width="10" />
<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;"> <view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
<text>{{downLoadingText}}</text> <text>{{ downLoadingText }}</text>
<text>({{downloadedSize}}M/{{packageFileSize || 0}}M)</text> <text>({{ downloadedSize }}M/{{ packageFileSize || 0 }}M)</text>
</view> </view>
</view> </view>
<!-- 选项 --> <!-- 选项 -->
<view v-else class="btns flex f-x-b"> <view v-else class="btns flex f-x-b">
<!-- IOS --> <!-- IOS -->
<view v-if="platform == 'ios'" class="btn confirm" :style="btnStyle" @click="jumpToAppStore"> <view v-if="platform == 'ios'" class="btn confirm" :style="btnStyle" @click="jumpToAppStore">
{{downloadBtnTextIOS}} {{ downloadBtnTextIOS }}
</view> </view>
<!-- android --> <!-- android -->
<view v-else class="btn confirm" :style="btnStyle" @click="updataApp"> <view v-else class="btn confirm" :style="btnStyle" @click="updataApp">
{{downloadBtnTextAndroid}} {{ downloadBtnTextAndroid }}
</view> </view>
</view> </view>
<!-- 短期内不在提醒 --> <!-- 短期内不在提醒 -->
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
</template> </template>
<script> <script>
/** /**
* geek-appUpdata app更新提示框 * geek-appUpdata app更新提示框
* @description app更新提示框，支持热更新，强制更新，普通更新，暂不更新，后台下载，更新内容展示，进度条显示，ios跳转appstore等功能。 * @description app更新提示框，支持热更新，强制更新，普通更新，暂不更新，后台下载，更新内容展示，进度条显示，ios跳转appstore等功能。
* @property {String} title 更新标题。 * @property {String} title 更新标题。
...@@ -75,10 +76,10 @@ ...@@ -75,10 +76,10 @@
* @example * @example
*/ */
import config from './config.js'; import config from './config.js';
import checkVersion from './js-sdk/checkVersion.js'; import checkVersion from './js-sdk/checkVersion.js';
import {loadDevice,loadNetwork,loadUuid,loadLocation} from '../../utils/deviceInfo.js' import { loadDevice, loadNetwork, loadUuid, loadLocation } from '../../utils/deviceInfo.js'
export default { export default {
name: 'geekAppUpdata', name: 'geekAppUpdata',
props: config.props, props: config.props,
data() { data() {
...@@ -421,9 +422,9 @@ ...@@ -421,9 +422,9 @@
// loadLocation() // loadLocation()
// loadUuid() // loadUuid()
const headerDevice = uni.getStorageSync('m-header-device') const headerDevice = uni.getStorageSync('m-header-device')
console.log(headerDevice,'headerDevice') console.log(headerDevice, 'headerDevice')
if (this.downloading) { if (this.downloading) {
console.log(1,'9') console.log(1, '9')
uni.showModal({ uni.showModal({
title: '是否取消下载？', title: '是否取消下载？',
cancelText: '否', cancelText: '否',
...@@ -439,7 +440,7 @@ ...@@ -439,7 +440,7 @@
} }
}); });
} else { } else {
console.log(2,'9') console.log(2, '9')
this.$refs.popup.close(); this.$refs.popup.close();
// 如果用户短期内不更新 // 如果用户短期内不更新
if (this.userNotRemind) { if (this.userNotRemind) {
...@@ -471,11 +472,15 @@ ...@@ -471,11 +472,15 @@
} }
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less">
.appUploadAlertBox { page {
background: transparent;
}
.appUploadAlertBox {
.bg { .bg {
width: 100%; width: 100%;
} }
...@@ -490,8 +495,9 @@ ...@@ -490,8 +495,9 @@
background-color: #FFF; background-color: #FFF;
padding-bottom: 40rpx; padding-bottom: 40rpx;
position: relative; position: relative;
.close { .close {
position: absolute ; position: absolute;
right: 15rpx; right: 15rpx;
top: 15rpx; top: 15rpx;
z-index: 10000001; z-index: 10000001;
...@@ -600,5 +606,5 @@ ...@@ -600,5 +606,5 @@
bottom: -120rpx; bottom: -120rpx;
left: calc(50% - 70rpx / 2); left: calc(50% - 70rpx / 2);
} }
} }
</style> </style>
pages/app-update/js-sdk/silentlyAppUpdate.js
View file @ 4735acca
...@@ -45,9 +45,7 @@ export default function silentlyAppUpdate() { ...@@ -45,9 +45,7 @@ export default function silentlyAppUpdate() {
// } // }
// }); // });
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",
......
pages/index/index.vue
View file @ 4735acca
...@@ -112,7 +112,6 @@ ...@@ -112,7 +112,6 @@
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')
...@@ -247,30 +246,31 @@ ...@@ -247,30 +246,31 @@
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,'查询商品')
try{
self.$request('/pawn/category/getGoodsPage','POST',params).then(res => { self.$request('/pawn/category/getGoodsPage','POST',params).then(res => {
const {current,total,size,records }=res.result const {current,total,size,records }=res.result
const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页 const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页
if(self.loadFlag){ if(self.loadFlag){
self.IndexList=self.IndexList.concat(records) self.IndexList=self.IndexList.concat(records)
}else{ }else{
self.IndexList=records self.IndexList=records
} }
self.hasNextPage=hasNextPage self.hasNextPage=hasNextPage
self.loadFlag=false self.loadFlag=false
}).catch(err=>{ }).catch(err=>{
console.log(err,'请求出错') console.log(err,'请求出错')
}) })
}catch{
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 source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/app-view.js
View file @ 4735acca
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/manifest.json
View file @ 4735acca
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__DE04B13","name":"多典花","version":{"name":"1.0.1","code":101},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Geolocation":{},"Contacts":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"none","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"distribute":{"orientation":["portrait-primary"]},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/> ","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"targetSdkVersion":30,"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none","prompt":"为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"}},"apple":{"dSYMs":false,"privacyDescription":{"NSLocationWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysAndWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSPhotoLibraryUsageDescription":"为了给您提供意见反馈服务，请允许访问您的相册信息","NSCameraUsageDescription":"以便于您可以使用正常使用身份证认证、刷脸、申请借款等功能"},"idfa":false},"plugins":{"ad":{},"geolocation":{"system":{"__platform__":["ios","android"]},"amap":{"name":"amap_13669606635BrsJEpZoq","__platform__":["ios","android"],"appkey_ios":"219171ea69d16fa01856326bfce37395","appkey_android":"d5eb8009720b7ef9e540d1869d3c5f15"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"compatible":{"ignoreVersion":true},"nativePlugins":{"AThree-LFv2":{"__plugin_info__":{"name":"LFv2","description":"LFv2","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","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":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__DE04B13","name":"多典花","version":{"name":"1.0.1","code":101},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Geolocation":{},"Contacts":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"none","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"distribute":{"orientation":["portrait-primary"]},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/> ","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"targetSdkVersion":30,"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none","prompt":"为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"}},"apple":{"dSYMs":false,"privacyDescription":{"NSLocationWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysAndWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSPhotoLibraryUsageDescription":"为了给您提供意见反馈服务，请允许访问您的相册信息","NSCameraUsageDescription":"以便于您可以使用正常使用身份证认证、刷脸、申请借款等功能"},"idfa":false},"plugins":{"ad":{},"geolocation":{"system":{"__platform__":["ios","android"]},"amap":{"name":"amap_13669606635BrsJEpZoq","__platform__":["ios","android"],"appkey_ios":"219171ea69d16fa01856326bfce37395","appkey_android":"d5eb8009720b7ef9e540d1869d3c5f15"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"compatible":{"ignoreVersion":true},"nativePlugins":{"AThree-LFv2":{"__plugin_info__":{"name":"LFv2","description":"LFv2","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"4.28","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","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":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/app-plus/view.umd.min.js
View file @ 4735acca
This source diff could not be displayed because it is too large. You can view the blob instead.
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,26 +16,24 @@ export const convertPromise = function (FnName, params = {}) { ...@@ -16,26 +16,24 @@ 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,
} }
console.log(commons,'commons')
return commons return commons
} }
// 初始化请求头的device参数信息 // 初始化请求头的device参数信息
...@@ -72,10 +70,10 @@ export const initHeaderDevice = function () { ...@@ -72,10 +70,10 @@ 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),
...@@ -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,'日===')
if (common) {
rd = JSON.stringify(common) rd = JSON.stringify(common)
console.log(rd,'rd2') }
} }
} }
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 {
data,
statusCode
} = res;
if (statusCode === 200) { if (statusCode === 200) {
if (data.success==true) { if (data.success == true) {
return resolve(data) return resolve(data)
} else { } else {
if(data.code=='403'){ if (data.code == '403') {
console.log(res,'402'); console.log(res, '402');
uni.showToast({ uni.showToast({
title: data.message, title: data.message,
icon: "none", icon: "none",
...@@ -54,7 +58,7 @@ const request=async(url,type,data)=>{ ...@@ -54,7 +58,7 @@ const request=async(url,type,data)=>{
}) })
uni.removeStorageSync('token') uni.removeStorageSync('token')
}else{ } else {
uni.showToast({ uni.showToast({
title: data.message, title: data.message,
icon: "none", icon: "none",
...@@ -66,15 +70,15 @@ const request=async(url,type,data)=>{ ...@@ -66,15 +70,15 @@ const request=async(url,type,data)=>{
} }
} 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:'请求失败'
......
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