Skip to content

L
lumastoreapp
Commit ffde5fa4 authored by home's avatar home
Browse files
Options

Merge branch 'zxh' into dev

parents 747b7333 ee1aa799
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 142 deletions
App.vue
View file @ ffde5fa4
......@@ -2,10 +2,16 @@
import {newsRemind} from "@/utils/api/api.js";//获取商家消息
export default {
data:{
cid:''
},
onLaunch: function() {
// #ifdef APP-PLUS
// #ifdef APP-PLUS
let cID = plus.push.getClientInfo();
this.cid = cID.clientid
// console.log(cid)
//app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
setTimeout(()=>{
plus.navigator.closeSplashscreen();
......@@ -19,7 +25,8 @@
title:'温馨提示',
content:'检测到当前未打开网络,请打开网络',
showCancel:false
})
})
}else if(res.networkType=='2g'||res.networkType=='3g'){
uni.showModal({
title:'温馨提示',
......@@ -43,23 +50,32 @@
},
onShow: function() {
console.log(this.userInfo);
//console.log('App Show')
// console.log(this.cid);
// console.log('App Show')
},
onHide: function() {
//console.log('App Hide')
// console.log('App Hide')
},
methods:{
computed: {
userInfo(){
return this.$store.state.userInfo;
}
},
methods:{
//获取 语音消息
async getnewsRemind(){
async getnewsRemind(){
// console.log(this.cid)
var date = new Date();
let hours = date.getHours();//当前 时间 小时
let datestime = 1000*5;//默认15秒
if(this.$store.state.token!=""){//判断是否 已登录
let res = await newsRemind({})
let res = await newsRemind({
uid:this.$store.state.userInfo.user_id,
cid:this.cid
})
if(res.code==0){
if(res.data.length!=0){
//进来了就是有消息
......
manifest.json
View file @ ffde5fa4
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.86",
"versionCode" : 186,
"versionName" : "1.0.87",
"versionCode" : 187,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......@@ -114,38 +114,38 @@
},
"splashscreen" : {
"android" : {
"hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
"hdpi" : "C:/Users/Administrator/Desktop/da/DefaultLaunch640_1136.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/DefaultLaunch640_1136.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/DefaultLaunch640_1136.png"
},
"ios" : {
"iphone" : {
"portrait-896h@3x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-896h@3x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-896h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-896h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"iphonex" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"iphonexl" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina55" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina55l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina47" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina47l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina40" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina40l" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"retina35" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
"portrait-896h@3x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape-896h@3x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait-896h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape-896h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"iphonex" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"iphonexl" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina55" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina55l" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina47" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina47l" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina40" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina40l" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"retina35" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
},
"ipad" : {
"portrait-1366h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1366h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1366h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape-1366h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait-1194h@2" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1194h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1112h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-1112h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-retina7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape-retina7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"landscape7" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"portrait-1194h@2x" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
"landscape-1194h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait-1112h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape-1112h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait-retina7" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape-retina7" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait7" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"landscape7" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"portrait-1194h@2x" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
}
},
"iosStyle" : "common"
......
pages/index/index.vue
View file @ ffde5fa4
......@@ -237,7 +237,6 @@
export default {
data() {
return {
tancl: false,
shop_id:"",
shop: {},
......@@ -284,34 +283,43 @@
},
methods: {
saoma(e){
this.$api.msg('即将开放')
// uni.scanCode({
// success:res => {
// uni.request({
// url: 'https://www.mxnzp.com/api/barcode/goods/details', //仅为示例，并非真实接口地址。
// data: {
// barcode: res.result,
// needImg: true,
// app_id:'qkkbptetyohxoiod',
// app_secret:'Wkp2a3NiNjAzTFJLRmwrZXN3QW1jZz09'
// },
// method:'GET',
// success: (results) => {
// console.log(results);
// if(results.data.code==0){
// this.$api.msg(results.data.msg);
// }else if(results.data.code==1){
// results.isScanCode=false;
// results.code=res.result;
// uni.navigateTo({
// url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
// })
// console.log(results)
// }
// }
// })
// }
// });
uni.scanCode({
success:res => {
uni.request({
url: 'https://www.mxnzp.com/api/barcode/goods/details', //仅为示例，并非真实接口地址。
data: {
barcode: res.result,
needImg: true,
app_id:'qkkbptetyohxoiod',
app_secret:'Wkp2a3NiNjAzTFJLRmwrZXN3QW1jZz09'
},
method:'GET',
success: (results) => {
console.log(results);
if(results.data.code==0){
this.$api.msg(results.data.msg);
}else if(results.data.code==1){
results.isScanCode=false;
results.code=res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
})
console.log(results)
}
},
fail :(results) => {
console.log(results);
results.isScanCode=false;
results.code=res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
})
}
})
}
});
},
jump(){
uni.navigateTo({
......@@ -320,23 +328,23 @@
},
shops(){
if(this.is_luck_draw==1){
// if(this.is_luck_draw==1){
uni.navigateTo({
url:"/pages/details/details?shop_id="+this.shop_id
})
}else{
uni.showModal({
title: '温馨提示',
content: '不符合参与条件！请联系客服开通权限400-807-3023',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
// }else{
// uni.showModal({
// title: '温馨提示',
// content: '不符合参与条件！请联系客服开通权限400-807-3023',
// success: function (res) {
// if (res.confirm) {
// console.log('用户点击确定');
// } else if (res.cancel) {
// console.log('用户点击取消');
// }
// }
// });
// }
},
demoaudio() {
......
pages/login/login.vue
View file @ ffde5fa4
......@@ -216,7 +216,10 @@
this.$api.msg("您需要先同意用户协议和隐私策略");
return false;
}
let cID=''
// #ifdef APP-PLUS
cID = plus.push.getClientInfo();
// #endif
if(this.username==""){
this.$api.msg("用户名不能为空");
......@@ -228,7 +231,8 @@
let res = await userLogin({
username:this.username,
password:this.password,
password:this.password,
cid : cID.clientid?cID.clientid:''
});
this.$api.msg(res);
......
utils/debug.js
View file @ ffde5fa4
......@@ -4,14 +4,16 @@ module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:false,//正式
// isdebug:true,//测试
// isdebug:true,//测试
// xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS
......
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