Commit 05649a8d authored by xieyishang's avatar xieyishang

~~

parent e7b35207
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
import permision from "@/utils/permission.js";//App平台的授权判断封装js import permision from "@/utils/permission.js";//App平台的授权判断封装js
export default { export default {
onLaunch: function() { onLaunch: function() {
uni.setStorageSync("tourist",0);//是否是游客模式 0 否 1 是
if(platform=='ios'){ if(platform=='ios'){
bgAudioMannager.title = '您已进入鹿马商家助手...'; bgAudioMannager.title = '您已进入鹿马商家助手...';
bgAudioMannager.singer = '小马将为你进行实时播报语音'; bgAudioMannager.singer = '小马将为你进行实时播报语音';
......
{ {
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "鹿马商家管理系统-登录" "navigationBarTitleText": "鹿马商家管理系统-登录"
} }
}, },
{
"path": "pages/register/register",
"style": {
"navigationBarTitleText": "注册"
}
},
{
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "首页"
}
},
{ {
"path": "pages/yjWithdraw/yjWithdraw", "path": "pages/yjWithdraw/yjWithdraw",
"style": { "style": {
...@@ -27,14 +42,6 @@ ...@@ -27,14 +42,6 @@
} }
}, },
{
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "首页"
}
},
{ {
"path": "pages/notice/notice", "path": "pages/notice/notice",
"style": { "style": {
......
...@@ -364,6 +364,10 @@ ...@@ -364,6 +364,10 @@
<Welcome ref="Welcome"></Welcome> <Welcome ref="Welcome"></Welcome>
<!-- 欢迎回来 --> <!-- 欢迎回来 -->
<yomol-upgrade ref="yomolUpgrade"></yomol-upgrade> <yomol-upgrade ref="yomolUpgrade"></yomol-upgrade>
<view class="submitbtn OutTourist" @tap="OutTourist">退出游客模式</view>
</view> </view>
</template> </template>
...@@ -448,6 +452,13 @@ ...@@ -448,6 +452,13 @@
}, },
methods: { methods: {
//退出游客模式
OutTourist(){
uni.setStorageSync("tourist",0);//是否是游客模式 0 否 1 是
uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1'
});
},
//手动开启语音播报 //手动开启语音播报
open_order_tis(){ open_order_tis(){
//#ifdef APP-PLUS //#ifdef APP-PLUS
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<checkbox class="checkbox" color="#ff6900" value="cb" :checked="ischecked" /> <text>记住密码</text> <checkbox class="checkbox" color="#ff6900" value="cb" :checked="ischecked" /> <text>记住密码</text>
</checkbox-group> </checkbox-group>
</view> </view>
<view @click="getregister">我要注册</view>
<view @click="change_sta">忘记密码?</view> <view @click="change_sta">忘记密码?</view>
</view> </view>
<view class="con_04" style="margin-top: 0px;"> <view class="con_04" style="margin-top: 0px;">
...@@ -31,11 +32,15 @@ ...@@ -31,11 +32,15 @@
</view> </view>
<!-- #ifdef H5 -->
<view class="con_04" style="margin-top: 30px;"> <view class="con_04" style="margin-top: 30px;">
<view class="con_04_1 " @tap="logindemo()">测试登录</view> <view class="con_04_1" @tap="tourist">游客模式</view>
</view> </view>
<!-- #ifdef H5 -->
<!-- <view class="con_04" style="margin-top: 30px;">
<view class="con_04_1 " @tap="logindemo()">测试登录</view>
</view> -->
<!-- #endif --> <!-- #endif -->
</view> </view>
...@@ -66,15 +71,11 @@ ...@@ -66,15 +71,11 @@
<view class="con_04_1 con_04_2" @click="edit_psd">提交</view> <view class="con_04_1 con_04_2" @click="edit_psd">提交</view>
</view> </view>
</view> </view>
<showxieyi ref="showxieyi" @isclickty="isclickty"></showxieyi> <showxieyi ref="showxieyi" @isclickty="isclickty"></showxieyi>
<!-- 使用协议 --> <!-- 使用协议 -->
<view class="dingyuesm"> <view class="dingyuesm">
<view class="xieyitagbox flex ali-c flexc"> <view class="xieyitagbox flex ali-c flexc">
<view class="flex ali-c"> <view class="flex ali-c">
...@@ -138,12 +139,9 @@ ...@@ -138,12 +139,9 @@
this.login(); this.login();
} }
}, },
onLoad() { onLoad() {
//处理 协议 按钮 //处理 协议 按钮
let istongyi = uni.getStorageSync('istongyi'); let istongyi = uni.getStorageSync('istongyi');
if(istongyi){ if(istongyi){
...@@ -163,6 +161,23 @@ ...@@ -163,6 +161,23 @@
}, },
methods: { methods: {
//游客模式
tourist(){
if(this.isAgree==false){
this.$api.msg("您需要先同意用户协议和隐私策略");
return false;
}
uni.setStorageSync("tourist",1);//是否是游客模式 0 否 1 是
uni.switchTab({
url:"/pages/index/index"
})
},
//怎么注册
getregister(){
uni.navigateTo({
url:"/pages/register/register"
})
},
//单选框 //单选框
radioChange(e){ radioChange(e){
this.isAgree = !this.isAgree; this.isAgree = !this.isAgree;
...@@ -206,8 +221,10 @@ ...@@ -206,8 +221,10 @@
}, },
//测试登录方法 h5使用 //测试登录方法 h5使用
logindemo(){ logindemo(){
this.username="18979561614"; //18979561614
this.password="123456"; this.username="18770001107";
this.password="123321";
this.isAgree = true;
this.login(); this.login();
}, },
async login(){ async login(){
......
<template>
<view class="register">
<!-- 注册指引 -->
<view class="rztext">商家入驻申请需通过「鹿马108」APP或小程序提交。请您下载或打开「鹿马108」,选择「我要合作」选项,填写入驻表单并提交审核。提交前请阅读《隐私政策》了解信息处理规则。</view>
<view class="yd_img_view">
<image class="yd_img" v-for="(item,index) in yd_imglist" :key="index" :src="staticUrl+item" mode="widthFix"></image>
</view>
</view>
</template>
<script>
export default {
data(){
return {
yd_imglist:[
'2025/03/17/67d7be5bdb7e3.png',
"2025/03/17/67d7be96048e7.png",
"2025/03/17/67d7bea9a93c7.png",
"2025/03/17/67d7bebf8c81d.png",
"2025/03/17/67d7becc144c6.png"
]
}
},
computed:{
staticUrl(){
return this.$store.state.staticUrl
}
},
onLoad() {
},
methods:{
}
}
</script>
<style lang="scss">
page{
padding: 20rpx;
}
.rztext{
color: #000000;
font-size: 32rpx;
text-indent: 21pt;
}
.yd_img_view{
text-align: center;
.yd_img{
margin: 10rpx 0;
width: 700rpx;
}
}
</style>
\ No newline at end of file
...@@ -94,6 +94,8 @@ ...@@ -94,6 +94,8 @@
</view> </view>
</eModal> </eModal>
<!-- 绑定手机号 --> <!-- 绑定手机号 -->
<view class="submitbtn OutTourist" @tap="OutTourist">退出游客模式</view>
</view> </view>
</template> </template>
...@@ -137,6 +139,13 @@ ...@@ -137,6 +139,13 @@
this.initimlogin(); this.initimlogin();
}, },
methods: { methods: {
//退出游客模式
OutTourist(){
uni.setStorageSync("tourist",0);//是否是游客模式 0 否 1 是
uni.navigateTo({
url: '/pages/login/login?zd=1&isfanhui=1'
});
},
//初始化一下 如果没登录 那就重新登录一下IM //初始化一下 如果没登录 那就重新登录一下IM
initimlogin(){ initimlogin(){
this.$store.dispatch("InItImlogin"); this.$store.dispatch("InItImlogin");
......
...@@ -239,6 +239,9 @@ $uni-color-error: #dd524d; ...@@ -239,6 +239,9 @@ $uni-color-error: #dd524d;
.submitbtn.active{ .submitbtn.active{
background: #FF6900; background: #FF6900;
} }
.OutTourist{
border-radius: 70rpx;
}
//按钮样式 //按钮样式
......
...@@ -48,6 +48,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -48,6 +48,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
if(api=='store/newsRemind'){//直接返回 if(api=='store/newsRemind'){//直接返回
return false; return false;
} }
let tourist = uni.getStorageSync("tourist");
if(tourist!=1){//非游客模式才会提示 未登录 前往授权登录
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
...@@ -67,6 +69,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -67,6 +69,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
} }
} }
}); });
}
return false; return false;
...@@ -132,7 +135,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -132,7 +135,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
store.commit("changetoken","");//清除 store.commit("changetoken","");//清除
uni.setStorageSync("token","");//清除 uni.setStorageSync("token","");//清除
let tourist = uni.getStorageSync("tourist");
if(tourist!=1){//非游客模式才会提示 未登录 前往授权登录
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '您的登录信息已过期,是否去登录授权?', content: '您的登录信息已过期,是否去登录授权?',
...@@ -152,6 +156,11 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -152,6 +156,11 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
} }
}); });
}else{
reslove({}, {});
}
reslove(res.data, res); reslove(res.data, res);
} }
......
...@@ -34,6 +34,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -34,6 +34,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
// #ifdef APP-PLUS // #ifdef APP-PLUS
// #endif // #endif
let tourist = uni.getStorageSync("tourist");
if(tourist!=1){//非游客模式才会提示 未登录 前往授权登录
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '您还没有登录授权,是否先登录授权?', content: '您还没有登录授权,是否先登录授权?',
...@@ -52,6 +54,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -52,6 +54,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
} }
} }
}); });
}
return false; return false;
...@@ -110,7 +113,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -110,7 +113,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
store.commit("changetoken","");//清除 store.commit("changetoken","");//清除
uni.setStorageSync("token","");//清除 uni.setStorageSync("token","");//清除
let tourist = uni.getStorageSync("tourist");
if(tourist!=1){//非游客模式才会提示 未登录 前往授权登录
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '您的登录信息已过期,是否去登录授权?', content: '您的登录信息已过期,是否去登录授权?',
...@@ -130,6 +134,10 @@ export default function request(api, method, data, {noAuth = false, noVerify = f ...@@ -130,6 +134,10 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
} }
}); });
}else{
reslove({}, {});
}
reslove(res.data, res); reslove(res.data, res);
} }
......
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