Commit 82c80983 authored by xieyishang's avatar xieyishang

~~~

parent c15ff138
{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"app-plus" :
{
"launchtype" : "remote"
},
"default" :
{
"launchtype" : "remote"
},
"h5" :
{
"launchtype" : "remote"
},
"type" : "uniCloud"
}
{
// launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
"version" : "0.0",
"configurations" : [
{
"app-plus" : {
"launchtype" : "remote"
},
"default" : {
"launchtype" : "remote"
},
"h5" : {
"launchtype" : "remote"
},
"type" : "uniCloud"
},
{
"playground" : "custom",
"type" : "uni-app:app-android"
}
]
}
......@@ -2,8 +2,8 @@
"name" : "鹿马商家助手",
"appid" : "__UNI__1EA80F1", //这个是 web
"description" : "商家",
"versionName" : "1.186",
"versionCode" : 1186,
"versionName" : "1.188",
"versionCode" : 1188,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持
......
......@@ -335,6 +335,29 @@
</navigator>
</view>
<view @tap="open_order_tis" class="jiu_max " v-if="shop_type == 'ele' || shop_type=='goods'">
<view >
<view class="jiu_min">
<view>
<image class="img" src="/static/yuyingbb.png" mode=""></image>
</view>
<view>开启语音播报</view>
</view>
</view>
</view>
<view @tap="close_order_tis" class="jiu_max " v-if="shop_type == 'ele' || shop_type=='goods'">
<view >
<view class="jiu_min">
<view>
<image class="img" src="/static/yuyingbb.png" mode=""></image>
</view>
<view>关闭语音播报</view>
</view>
</view>
</view>
</view>
<view class="BH"></view>
......@@ -392,30 +415,7 @@
// this.$refs.Welcome.show();
// }, 2000)
//#ifdef APP-PLUS
if ((plus.device.getVolume() * 1000) < 600) { //获取手机音量
uni.showModal({
title: '提示:音量较小',
content: '当前手机音量较小,可能无法及时获取新的订单播报,建议设置为最大音量',
success: (res) => {
if (res.confirm) {
plus.device.setVolume(1); //设置手机音量
setTimeout(() => {
this.$api.msg('设置成功');
}, 500)
}
},
});
}
if (uni.getSystemInfoSync().platform != 'ios') {
getApp().hgServiceFun();//安卓保活
}else{
getApp().getIosLocation(2,'index');//苹果保活
}
//#endif
//调试
// getApp().getIosLocation(2,'index');
......@@ -445,40 +445,91 @@
this.getLmguPiao();//获取商家股票信息
if (uni.getStorageSync('dwstatus') == '') {
getApp().getnewsRemind().then(res => {
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
}, 5000);
this.$store.commit('Timer', Timer);
}
},
methods: {
//手动开启语音播报
open_order_tis(){
//#ifdef APP-PLUS
this.$showModal({
title:'温馨提示',
concent:'系统将开启后台运行,并后台实时获取定位,用于订单语音播报?',
cancelVal:'取消',
confirmVal:'确定',
}).then(resa=>{
if ((plus.device.getVolume() * 1000) < 600) { //获取手机音量
uni.showModal({
title: '提示:音量较小',
content: '当前手机音量较小,可能无法及时获取新的订单播报,建议设置为最大音量',
success: (res) => {
if (res.confirm) {
plus.device.setVolume(1); //设置手机音量
setTimeout(() => {
this.$api.msg('设置成功');
}, 500)
}
},
});
}
})
} else {
if (uni.getStorageSync('dwstatus') == 3 || uni.getStorageSync('dwstatus') == 0) {
//this.$api.msg('不是第一次')
getApp().getIosLocation(2,'index');
}else {
//this.$api.msg('第一次')
getApp().getnewsRemind().then(res => {
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
}, 5000);
this.$store.commit('Timer', Timer);
if (uni.getSystemInfoSync().platform != 'ios') {
getApp().hgServiceFun();//安卓保活
}else{
getApp().getIosLocation(2,'index');//苹果保活
}
if (uni.getStorageSync('dwstatus') == '') {
getApp().getnewsRemind().then(res => {
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
}, 5000);
this.$store.commit('Timer', Timer);
}
}
})
} else {
if (uni.getStorageSync('dwstatus') == 3 || uni.getStorageSync('dwstatus') == 0) {
//this.$api.msg('不是第一次')
getApp().getIosLocation(2,'index');
}else {
//this.$api.msg('第一次')
getApp().getnewsRemind().then(res => {
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
}, 5000);
this.$store.commit('Timer', Timer);
}
}
})
}
})
}
}
},
methods: {
}
})
//#endif
},
close_order_tis(){
//#ifdef APP-PLUS
const pushLive = uni.requireNativePlugin('push-live');
pushLive.closeService(function(res) {
//'停止保活');
});
//#endif
},
//获取商家的股票信息
async getLmguPiao(){
let res = await getLmguPiao({
......
......@@ -169,10 +169,9 @@
},
isclickty(){//弹窗的同意被点击后
this.isAgree = true;
// this.isAgree = true;
//this.appLogin();//关闭自动登陆
uni.setStorageSync('istongyi', true);//存储用户同意过的状态
// uni.setStorageSync('istongyi', true);//存储用户同意过的状态
},
back(){
......@@ -281,7 +280,12 @@
}
},
//发送验证码
async send(){
async send(){
if(this.isAgree==false){
this.$api.msg("您需要先同意用户协议和隐私策略");
return false;
}
if(!this.$yicode.checkPhone(this.mobile)){
this.$api.msg('手机号错误')
......
......@@ -86,7 +86,18 @@
<navigator url="/pages/feedback/feedback" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">意见反馈</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
</navigator>
<view @tap="withdrawuser" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">注销账号</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</view>
<view @tap="chehi" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">撤回隐私政策</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</view>
<view class="list-cell ali-c" @tap="ToUpdate">
<text class="cell-tit">检查更新</text>
......@@ -243,6 +254,68 @@
toLogoutone(){
// this.$store.Timer
this.$refs.moduPopupTwo.show();
},
//注销 账号
withdrawuser(){
this.$showModal({
title:'温馨提示',
concent:'你确定要注销账号吗?',
cancelVal:'取消',
confirmVal:'确定',
}).then(resa=>{
if(this.platform!='ios'){
const pushLive = uni.requireNativePlugin('push-live');
pushLive.closeService(function(res) {
//'停止保活');
});
}
this.$api.msg("请等待审核~");
uni.setStorageSync('token',"");
this.$store.commit('changetoken',"");
this.$store.commit('changeuserInfo', {});
uni.setStorageSync('userInfo', {});
uni.clearStorage();
clearInterval(this.$store.state.Timer)
this.$store.state.Timer = ''
setTimeout(()=>{
// uni.navigateBack();
uni.navigateTo({
url:"/pages/login/login",
})
}, 500)
})
},
//撤回隐私政策
chehi(){
this.$showModal({
title:'温馨提示',
concent:'你确定要撤回隐私政策吗?',
cancelVal:'取消',
confirmVal:'确定',
}).then(resa=>{
if(this.platform!='ios'){
const pushLive = uni.requireNativePlugin('push-live');
pushLive.closeService(function(res) {
//'停止保活');
});
}
this.$api.msg("已撤回~");
uni.setStorageSync('token',"");
this.$store.commit('changetoken',"");
this.$store.commit('changeuserInfo', {});
uni.setStorageSync('userInfo', {});
uni.clearStorage();
clearInterval(this.$store.state.Timer)
this.$store.state.Timer = ''
setTimeout(()=>{
// uni.navigateBack();
uni.navigateTo({
url:"/pages/login/login",
})
}, 500)
})
},
//退出登录
toLogout(){
......
......@@ -5,8 +5,8 @@ module.exports = {
// isdebug:false,//正式
isdebug:true,//测试
isdebug:false,//正式
// isdebug:true,//测试
// xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
......
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