Skip to content

L
lumastoreapp
Commit 48225b9e authored by 000's avatar 000
Browse files
Options

Merge branch 'dev' into 'feature_recommend_q' 

Dev

See merge request !4
parents c12e1f71 77ea1ba6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2308 additions and 776 deletions
App.vue
View file @ 48225b9e
<script>
const bgAudioMannager = uni.getBackgroundAudioManager();
const platform=uni.getSystemInfoSync().platform;
const time='';
const time='';
import {newsRemind} from "@/utils/api/api.js";//获取商家消息
export default {
onLaunch: function() {
if(platform=='ios'){
......@@ -17,14 +16,13 @@
bgAudioMannager.pause(); //pause 暂停
});
}
// #ifdef APP-PLUS
//app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
setTimeout(()=>{
plus.navigator.closeSplashscreen();
},100);
uni.getNetworkType({ //查看是否有网络
success: function (res) {
if(res.networkType=='none'){
......@@ -66,37 +64,78 @@
var rsult=hgService.checkIfLimited(); //检测是否限制后台运行
if(rsult.isLimit){ //限制了后台运行
hgService.requestIgnoreLimit(); //申请允许后台运行
hgService.requestIgnoreLimit(); //申请
}else{ //没有限制后台运行
console.log('没有限制');
hgService.startService(); //启动前台服务
//hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
}
// console.log('没有限制');
hgService.startService(); //启动前台服务
// hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
//var globalEvent = uni.requireNativePlugin('globalEvent'); //全局事件回调 任务启动时间，会有一定延时 一般一分钟内。
},
// hgServiceFun(){
// const pushLive = uni.requireNativePlugin('push-live');
// pushLive.startService({ //启动服务
// title: "鹿马商家助手",
// content: "小鹿正在为您进行实时播报...",
// mode: 1 //0省电模式 1流氓模式
// }, function(res) {
// console.log(res)
// });
// pushLive.isIgnoringBatteryOptimizations(function(res) { //是否添加到白名单中
// if(res.flag){ //添加进去了
// //pushLive.gotoWhiteListSetting();
// }else{
// pushLive.requestIgnoreBatteryOptimizations(); //申请加入白名单
// }
// })
// var globalEvent = uni.requireNativePlugin('globalEvent');
// globalEvent.addEventListener('doJobEvent', function() {
// console.log("我被定时启动了。。。。。。。。。。。。。。。。。")
// });
// console.log(globalEvent)
// },
//获取 语音消息
async getnewsRemind(type){
var date = new Date();
let hours = date.getHours();//当前 时间 小时
let datestime = 5000;//默认15秒
let datestime = 5000;//默认15秒
if(this.$store.state.token!=""){//判断是否 已登录
//#ifdef APP-PLUS
let cid = plus.push.getClientInfo().clientid
//#endif
console.log('这里')
let res = await newsRemind({
uid:this.$store.state.userInfo.user_id,
cid:plus.push.getClientInfo().clientid
cid:cid
});
if(res.code==0){
console.log('有语音','--------',res);
if(res.data.length!=0){
let KJres = res.data.filter(item =>{ //快捷支付
return item.type==3
return item.type==3 || item.type==0
})
let PSres = res.data.filter(item => { //订单
return item.type==4 || item.type==5 || item.type==6
return item.type==4 || item.type==5 || item.type==6 || item.type==1
})
if(platform=='ios'){
......@@ -140,17 +179,21 @@
}else{
if(PSres.length!=0){
let msgtext = `你有${PSres.length}条鹿马订单,请及时处理`;
console.log('商城语音播报')
if(this.$store.state.isvoice){
this.$store.dispatch('AudioVoice',msgtext).then((e) => {
uni.vibrateLong();//震动 调用//400ms//长震动
})
}
}
if(KJres.length!=0){
let payText =""
KJres.map(item=>{
payText = payText+","+ item.contents
});
console.log('快捷支付播报')
if(this.$store.state.isvoice){
this.$store.dispatch('AudioVoice',payText).then((e) => {
uni.vibrateLong();//震动 调用//400ms//长震动
......@@ -161,7 +204,6 @@
}
}
if(type!=2){
return true;
}
......@@ -182,4 +224,4 @@
@import './common/qiun.css';
@import './style.css';//我的
</style>
</style>
\ No newline at end of file
components/moduPopup/moduPopup.vue
View file @ 48225b9e
......@@ -101,8 +101,10 @@
//提示弹窗
change(e) {
console.log('是否打开:' + e.show)
if (!e.show) {
console.log('是否打开:' + e.show)
console.log(this.$store.state.Timer,'退出登陆取消')
if (!e.show) {
console.log(this.$store.state.Timer,'退出登陆')
this.showtip = false
}
},
......@@ -110,7 +112,8 @@
this.showtip = false;
this.$emit("cancel",{});//触发回调方法
},
show(){
show(){
this.showtip = true;
},
//确认发布点击
......
components/orderItemss/orderItemss.vue
View file @ 48225b9e
......@@ -16,6 +16,9 @@
</view>
<view class="time">{{dataorder.create_time}}</view>
</view>
</view>
<view class="beizhu flex jus-b ali-c" style="border-bottom: 1px solid #f1f1f1;">
<text class="price">{{dataorder.username_tel}}</text>
</view>
<!-- 上面的是 -->
<!-- reorder -->
......@@ -23,7 +26,8 @@
<view class="beizhu flex jus-b ali-c">
<text class="beizhutext oneline flex1" v-if="dataorder.remark">备注：{{dataorder.remark||''}}</text>
<text class="beizhutext oneline flex1" v-if="dataorder.message">退款原因：{{dataorder.message||''}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
</view>
<view class="orderItemss_foot jus-b">
<view class="titmeboxs ali-c" >
......
components/plan-image-upload/up_img.vue
View file @ 48225b9e
......@@ -9,7 +9,7 @@
<view v-if="isShowAdd" class="imageUpload" @tap="selectImage">+</view>
</view>
<image v-if="showMoveImage" class="moveImage" :style="{left:posMoveImageLeft, top:posMoveImageTop}" :src="moveImagePath"></image>
<view class="showname">请添加奖品图片</view>
<view class="showname" style="margin-left: 20upx;">请添加图片</view>
</view>
</template>
......@@ -41,7 +41,6 @@
},
watch:{
value(){
console.log(this.value,'帆帆帆帆')
}
},
computed:{
......@@ -135,14 +134,9 @@
},
name: keyname,
success: function(res){
console.log(JSON.parse(res.data),'成功了啊啊')
if(res.statusCode === 200){
_self.value.push(JSON.parse(res.data))
completeImages ++
if(_self.showUploadProgress){
uni.showToast({
title: '上传进度：' + completeImages + '/' + imagePathArr.length,
......@@ -151,7 +145,7 @@
duration: 1000
});
}
console.log('success to upload image: ' + res.data)
//console.log('success to upload image: ' + res.data)
resolve('success to upload image:' + remoteUrlIndex)
}else{
console.log('fail to upload image:'+res.data)
......@@ -365,8 +359,8 @@
}
.imageItem, .imageUpload{
width: 200upx;
height: 200upx;
width: 190upx;
height: 190upx;
margin: 0 20upx 30upx 0;
}
.imageItem:nth-child(3n){
......
manifest.json
View file @ 48225b9e
......@@ -3,9 +3,14 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.90",
"versionCode" : 190,
"versionName" : "1.0.96",
"versionCode" : 196,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
"runtimeVersion" : "2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
"compilerVersion" : "2.9.8" //兼容的编译器版本号
},
/* 5+App特有相关weex */
"app-plus" : {
"usingComponents" : true,
......@@ -50,7 +55,12 @@
"<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\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\"/>",
"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
"<uses-permission android:name=\"android.permission.REORDER_TASKS\"/>",
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
"<uses-permission android:name=\"android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS\"/>"
]
},
/* ios打包配置 */
......@@ -116,9 +126,9 @@
},
"splashscreen" : {
"android" : {
"hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
"hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
},
"ios" : {
"iphone" : {
......@@ -154,22 +164,7 @@
}
},
"compilerVersion" : 2,
"nativePlugins" : {
"HG-Background" : {
"__plugin_info__" : {
"name" : "保活 前台运行",
"description" : "用于提高app存活概率或添加前台显示 q群：219508489",
"platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=2203",
"android_package_name" : "com.app.lumastore",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 1,
"pid" : "2203",
"parameters" : {}
}
}
}
"nativePlugins" : {}
},
/* 快应用特有相关 */
"quickapp" : {},
......
pages.json
View file @ 48225b9e
......@@ -235,6 +235,18 @@
"style" : {
"navigationBarTitleText":"添加外卖产品"
}
},
{
"path" : "pages/addEditEleProduct/editProductStore",
"style" : {
"navigationBarTitleText":"快捷修改库存"
}
},
{
"path" : "pages/addEditEleProduct/editProductPrice",
"style" : {
"navigationBarTitleText":"快捷修改价格"
}
},
{
"path" : "pages/ViewLogistics/ViewLogistics",
......
pages/addEditEleProduct/editProductPrice.vue 0 → 100644
View file @ 48225b9e
This diff is collapsed.
pages/addEditEleProduct/editProductStore.vue 0 → 100644
View file @ 48225b9e
This diff is collapsed.
pages/eleProduct/eleProduct.vue
View file @ 48225b9e
This diff is collapsed.
pages/index/index.vue
View file @ 48225b9e
This diff is collapsed.
pages/order/detail/detail.vue
View file @ 48225b9e
......@@ -23,11 +23,11 @@
</view>
</view>
<view class="" v-if="products.length!=0">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" style="height: 200upx;">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" >
<view class="goods " v-for="(item,index) of products" :key="index">
<image class="img" :src="staticUrl+item.photo" mode=""></image>
<view class='goods_02'><strong><strong><strong><strong><strong><strong></strong></strong></strong></strong></strong></strong>
<view class='goods_02' style="height: 200upx;">
<view class='goods_title'>{{item.product_name}}</view>
<view class="goods_des">{{item.desc}}</view>
<view class="goods_des">取餐码：{{detail.delivery_num}}</view>
......@@ -38,14 +38,18 @@
</view>
</view>
</view>
</view>
</view>
<view class='tag-e' v-else>
<view class="goods ">
<view class='goods_title'>快捷支付</view>
</view>
</view>
</view>
<view class="total">总计：¥ {{detail.total}}</view>
</view>
</view>
<view class="total">总计：¥ {{detail.total}}</view>
<view class="mess">
<view class="mess_01">订单信息</view>
<view class="mess_02">
......
pages/order/shopOrder.vue
View file @ 48225b9e
......@@ -56,8 +56,11 @@
</block>
</view>
</view>
</view>
<view class="order_foot flex jus-e mb-20 " >
<view class="heji"><text class="fuhao">{{item.username_tel}}</text></view>
</view>
<view class="pricebox flex ali-c jus-b">
<view class="pricebox flex ali-c jus-b" style="margin-top: 20upx;">
<!-- 剩余时间 只有待支付的时候有 未付款的时候才有 -->
<view class="titme oneline flex1" v-if="item.status==4">退款原因:{{item.refund_details}}</view>
<view v-else></view>
......
pages/setup/setup.vue
View file @ 48225b9e
......@@ -6,7 +6,13 @@
<navigator url="/pages/edit/shop/shop" class="list-cell b-b m-t" 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 class="list-cell b-b m-t" hover-class="cell-hover" :hover-stay-time="50" @click="qiDong">
<text class="cell-tit">允许后台自启</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</view>
<navigator url="/pages/edit/Qualifications/Qualifications" 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>
......@@ -132,9 +138,14 @@
return debug;
}
},
methods:{
methods:{
qiDong(){
const pushLive = uni.requireNativePlugin('push-live');
pushLive.gotoWhiteListSetting()
},
//联系客服
go(){
go(){
uni.makePhoneCall({
// 手机号
......@@ -213,7 +224,9 @@
this.$api.msg(`跳转到${url}`);
},
//显示弹窗 清除缓存的
toLogoutone(){
toLogoutone(){
// console.log(this.$store.state.Timer,'退出登入')
// this.$store.Timer
this.$refs.moduPopupTwo.show();
},
//退出登录
......@@ -229,7 +242,8 @@
this.$store.commit('changeuserInfo', {});
uni.setStorageSync('userInfo', {});
uni.clearStorage();
clearInterval(this.$store.state.Timer)
this.$store.state.Timer = ''
setTimeout(()=>{
// uni.navigateBack();
uni.navigateTo({
......
static/icon/psfei.png
View replaced file @ c12e1f71 View file @ 48225b9e
static/icon/psfei.png

8.28 KB | W: | H:

static/icon/psfei.png

3.42 KB | W: | H:

static/icon/psfei.png
static/icon/psfei.png
static/icon/psfei.png
static/icon/psfei.png
  • 2-up
  • Swipe
  • Onion skin
static/news/printer.png
View replaced file @ c12e1f71 View file @ 48225b9e
static/news/printer.png

1.04 KB | W: | H:

static/news/printer.png

2.82 KB | W: | H:

static/news/printer.png
static/news/printer.png
static/news/printer.png
static/news/printer.png
  • 2-up
  • Swipe
  • Onion skin
store/index.js
View file @ 48225b9e
......@@ -65,7 +65,7 @@ const store = new Vuex.Store({
isLog: false,
expiresTime: 0,
MyMenus: [],
userInfo: uni.getStorageSync('userInfo'),
userInfo: uni.getStorageSync('userInfo'),
//下面的是登录相关的
hasLogin: false,
......
utils/api/api.js
View file @ 48225b9e
......@@ -491,5 +491,14 @@ export function geTPublicadvices(data)
export function getShopDeliveryPrice(data)
{
return request.post("user/getShopDeliveryPrice",data,{ noAuth : true});
}
}
/**
* 下载
* @param {} data
*/
export function excel(data)
{
return request.post("index/excel",data,{ noAuth : true});
}
utils/api/merchant.js
View file @ 48225b9e
......@@ -45,3 +45,8 @@ export function getskipShop(data){
export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true});
}
utils/debug.js
View file @ 48225b9e
......@@ -5,13 +5,11 @@ 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