Skip to content

U
uni-app-ddh-shop
Commit 84d291ed authored by ly's avatar ly
Browse files
Options

duodianhua

parent 0d421e4d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 253 deletions
.history/pages/my/index_20240803112321.vue deleted 100644 → 0
View file @ 0d421e4d
<template>
<view class='my-page'>
<view class='my-top'>
<view class='my-header'>
<image class='header-img' src='http://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'>
<view class='des-name' v-if="userTel!=''">{{userTel}}</view>
<view class='des-name' v-else @click='goLogin'>注册/登录</view>
<view class='des-text'>多惠花承诺保护您的信息安全</view>
</view>
</view>
<view class="my-contain">
<i class='con-top'></i>
<view class='con-box' v-show='menuList && menuList.length>0'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id">
<view class='line-item'>
<view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image>
<view class='l-text'>{{item.title}}</view>
</view>
<view class='item-r'></view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
userTel:'',
menuList:[],
mobileNum:''
}
},
onLoad(){
const token=uni.getStorageSync('token')
console.log(token,'token')
if(token==''){
this.userTel=''
this.Go('uni:/pages/login/login')
return false
}else{
this.init()
this.initTel()
}
},
methods: {
init(){
const self=this
self.$request('/client/userIndex','POST').then((res)=>{
const { userInfo,menuList }=res.result
self.userTel=userInfo.cell
self.menuList=JSON.parse(menuList)
})
},
goLogin(){
this.Go('uni:/pages/login/login')
},
initTel(){
const self=this
self.$request('/setting','GET').then(res => {
const { protocol,phone }=res.result
self.mobileNum=phone
}).catch(err=>{
console.log(err,'请求出错')
})
},
goItem(item){
if(item.linkUrl!=''){
console.log('66',item)
this.Go(item.linkUrl)
}else{
console.log('67',this.mobileNum,item)
uni.makePhoneCall({
phoneNumber: this.mobileNum
});
}
}
},
onShow(){
const token=uni.getStorageSync('token')
console.log(token,'token')
if(token==''){
this.userTel=''
this.Go('uni:/pages/login/login')
return false
}else{
this.init()
this.initTel()
}
}
}
</script>
<style src='./index.less' lang="less" scoped></style>
\ No newline at end of file
.history/pages/my/index_20240803112410.vue deleted 100644 → 0
View file @ 0d421e4d
<template>
<view class='my-page'>
<view class='my-top'>
<view class='my-header'>
<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'>
<view class='des-name' v-if="userTel!=''">{{userTel}}</view>
<view class='des-name' v-else @click='goLogin'>注册/登录</view>
<view class='des-text'>多惠花承诺保护您的信息安全</view>
</view>
</view>
<view class="my-contain">
<i class='con-top'></i>
<view class='con-box' v-show='menuList && menuList.length>0'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id">
<view class='line-item'>
<view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image>
<view class='l-text'>{{item.title}}</view>
</view>
<view class='item-r'></view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
userTel:'',
menuList:[],
mobileNum:''
}
},
onLoad(){
const token=uni.getStorageSync('token')
console.log(token,'token')
if(token==''){
this.userTel=''
this.Go('uni:/pages/login/login')
return false
}else{
this.init()
this.initTel()
}
},
methods: {
init(){
const self=this
self.$request('/client/userIndex','POST').then((res)=>{
const { userInfo,menuList }=res.result
self.userTel=userInfo.cell
self.menuList=JSON.parse(menuList)
})
},
goLogin(){
this.Go('uni:/pages/login/login')
},
initTel(){
const self=this
self.$request('/setting','GET').then(res => {
const { protocol,phone }=res.result
self.mobileNum=phone
}).catch(err=>{
console.log(err,'请求出错')
})
},
goItem(item){
if(item.linkUrl!=''){
console.log('66',item)
this.Go(item.linkUrl)
}else{
console.log('67',this.mobileNum,item)
uni.makePhoneCall({
phoneNumber: this.mobileNum
});
}
}
},
onShow(){
const token=uni.getStorageSync('token')
console.log(token,'token')
if(token==''){
this.userTel=''
this.Go('uni:/pages/login/login')
return false
}else{
this.init()
this.initTel()
}
}
}
</script>
<style src='./index.less' lang="less" scoped></style>
\ No newline at end of file
pages.json
View file @ 84d291ed
......@@ -138,7 +138,7 @@
{
"path": "pages/websrc/websrc",
"style": {
"navigationBarTitleText": "454566",
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
......
pages/index/index.vue
View file @ 84d291ed
......@@ -88,7 +88,7 @@
</template>
<script>
import { switchShowTabbar, isLogin } from '@/utils/index'
import { switchShowTabbar, isLogin,initSettings } from '@/utils/index'
export default {
data() {
return {
......@@ -146,8 +146,9 @@ export default {
// 首页流量埋点
this.buryingPoint('app:index_page_view')
await this.initAjax();
initSettings()
// 显示隐藏tabBar
switchShowTabbar()
},
......
pages/login/login.vue
View file @ 84d291ed
......@@ -181,6 +181,11 @@ export default {
// 设置
switchShowTabbar();
}).catch(err => {
uni.showToast({
title: err.message,
icon: "none",
duration: 2000
})
console.log(err, '请求出错')
})
},
......
pages/my/index.vue
View file @ 84d291ed
......@@ -63,14 +63,17 @@ export default {
mobileNum: '',
menuBar: [],
serviceCall: '',
extMenuBarList: []
extMenuBarList: [],
HUrl:''
}
},
onLoad() {
this.init();
this.initPawn()
},
onShow() {
this.init();
this.initPawn()
},
// 页面下拉刷新
async onPullDownRefresh() {
......@@ -129,12 +132,23 @@ export default {
})
}
},
initPawn(){
const self=this
self.$request('/pawn/setting','GET').then(res => {
const { protocol,phone,h5Url }=res.result
if(h5Url){
self.HUrl=h5Url
console.log(self.HUrl,'setting')
}
}).catch(err=>{
console.log(err,'请求出错')
})
},
// 初始化APP配置页面
initTels() {
const self = this
self.$request('/app/v1/settings', 'GET').then(res => {
const { serviceCall } = res.result
const { serviceCall,h5Url } = res.result
self.serviceCall = serviceCall
}).catch(err => {
console.log(err, '请求出错')
......@@ -145,7 +159,6 @@ export default {
initMy() {
const self = this
self.$request('/app/v1/userIndex', 'GET').then(res => {
console.log(res, 'userIndex');
const { menuBar, user, baseMenuBar, extMenuBarList } = res.result
self.menuBar = menuBar
self.menuList = baseMenuBar
......@@ -158,6 +171,7 @@ export default {
})
},
goPage(item) {
console.log(item.title)
switch (item.title) {
case "我的浏览":
this.buryingPoint('app:my_browsing_history_click')
......@@ -182,17 +196,20 @@ export default {
},
goBar(item) {
console.log(item.linkUrl,'item')
let newPath
switch (item.title) {
case "我的还款":
this.buryingPoint('app:my_repayment_click')
newPath=this.HUrl+item.linkUrl
uni.navigateTo({
url:`/pages/web/websrc?url=${item.linkUrl}`
url:`/pages/web/websrc?url=${newPath}`
})
break;
case "申请记录":
this.buryingPoint('app:my_application_record_click')
newPath=this.HUrl+item.linkUrl
uni.navigateTo({
url:`/pages/web/websrc?url=${item.linkUrl}`
url:`/pages/web/websrc?url=${newPath}`
})
break;
default:
......
pages/setting/setting.vue
View file @ 84d291ed
......@@ -104,9 +104,11 @@
init(){
const self=this
self.$request('/pawn/setting','GET').then(res => {
const { protocol,phone }=res.result
console.log(protocol,typeof(protocol),'setting')
if(protocol){
console.log(typeof(protocol),'8888')
self.protocolList=JSON.parse(protocol)
}
}).catch(err=>{
......
pages/sort/index.vue
View file @ 84d291ed
......@@ -32,6 +32,7 @@
</template>
<script>
import { switchShowTabbar, isLogin,initSettings } from '@/utils/index'
export default {
data() {
return {
......@@ -140,6 +141,7 @@
onShow() {
this.init()
this.initSearch()
initSettings()
}
}
</script>
......
pages/web/web.vue
View file @ 84d291ed
......@@ -26,7 +26,7 @@ export default {
name: "WEB",
data() {
return {
src: api['h5'],
src:'',
wv: null,
isLogin: token,
canBack: false,
......@@ -72,12 +72,18 @@ export default {
this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
},
async onLoad(option) {
console.log(option,'参数555')
const mianH5Url=uni.getStorageSync('mianH5Url')
const that = this
if (option.src) {
that.src = option.src
if(mianH5Url){
console.log(mianH5Url,'参数666')
that.src = mianH5Url
}
// if (option.src) {
// console.log(option.src,'参数555')
// that.src = option.src
// }
uni.getStorage({
key: 'm-device-info',
success: function (res) {
......
pages/web/websrc.vue
View file @ 84d291ed
......@@ -78,12 +78,7 @@ export default {
if(option.url){
that.src=option.url
}
// const newURL=uni.getStorageSync('web-src')
console.log(option,'参数555')
// if (newURL) {
// that.src = newURL
// }
uni.getStorage({
key: 'm-device-info',
success: function (res) {
......@@ -97,8 +92,6 @@ export default {
},
onShow() {
console.log('WEB show方法')
// const newURL=uni.getStorageSync('web-src')
// this.src=newURL
if (uni.getStorageSync('canRefreshWeb')) {
uni.removeStorageSync('canRefreshWeb')
if (this.wv) {
......
server/common.js
View file @ 84d291ed
......@@ -4,5 +4,9 @@ export default {
/* 初始化 */
async initTabBar(data) {
return request('/pawn/setting/other/switch/loan', 'GET', data);
},
/* 初始化h5地址 */
async initSettings(data) {
return request('/pawn/setting', 'GET', data);
}
}
unpackage/dist/dev/app-plus/app-config-service.js
View file @ 84d291ed
......@@ -2,7 +2,7 @@
var isReady=false;var onReadyCallbacks=[];
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/web/contact","pages/webview/webview","pages/websrc/websrc","pages/web/web","pages/web/websrc","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","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/web/web","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/sort/index","iconPath":"/static/tab/sort-h.png","selectedIconPath":"/static/tab/sort.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 __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom","bounce":"none"}},{"path":"/pages/sort/index","meta":{"isQuit":true,"isTabBar":true},"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/web/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/websrc/websrc","meta":{},"window":{"navigationBarTitleText":"454566","enablePullDownRefresh":false}},{"path":"/pages/web/web","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/websrc","meta":{},"window":{"navigationStyle":"custom","enablePullDownRefresh":false}},{"path":"/pages/bill/indexs","meta":{},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/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"}},{"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":{"isQuit":true,"isTabBar":true},"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/web/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/websrc/websrc","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/web/web","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/websrc","meta":{},"window":{"navigationStyle":"custom","enablePullDownRefresh":false}},{"path":"/pages/bill/indexs","meta":{},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/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"}},{"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.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()})}});
service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
unpackage/dist/dev/app-plus/app-service.js
View file @ 84d291ed
This diff is collapsed.
utils/index.js
View file @ 84d291ed
......@@ -73,7 +73,14 @@ export const switchShowTabbar = async () => {
}
}
}
//获取h5url地址信息
export const initSettings=async()=>{
const res=await API.initSettings()
const {h5Url}=res.result
console.log(h5Url,'h5Url3333')
uni.setStorageSync('mianH5Url',h5Url)
}
// 设备信息
export const loadDevice = async () => {
convertPromise('getSystemInfo').then(result => {
......
utils/request.js
View file @ 84d291ed
......@@ -13,7 +13,9 @@ const request = async (url, type, data) => {
rd = initHeaderInfo()
} else {
if (headerDevice) {
rd = headerDevice
rd = encodeURIComponent(headerDevice)
console.log(rd,'设备信息')
} else {
const common = initHeaderDevice()
console.log(common, '日===')
......@@ -22,12 +24,11 @@ const request = async (url, type, data) => {
}
}
}
console.log(rd,'错误信息333')
}catch(err){
console.log(err,'congzhelizou')
}
console.log(rd,'设备信息')
return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token')
const tokenFinance = uni.getStorageSync('tokenFinance')
......
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