Skip to content

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

zxzf

parent 4d0103d9
Show whitespace changes
Inline Side-by-side
Showing with 601 additions and 506 deletions
manifest.json
View file @ fed5ec73
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.95",
"versionCode" : 195,
"versionName" : "1.0.96",
"versionCode" : 196,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
......
pages/eleProduct/eleProduct.vue
View file @ fed5ec73
......@@ -20,10 +20,8 @@
</view>
</view>
</view>
<!-- tab切换 -->
<view class="projuctTab flex" v-if="edit==0">
<view class="tabitems flex1" :class="{active:tabactive==1}" @tap="taggletab(1)">
......
pages/index/index.vue
View file @ fed5ec73
......@@ -9,27 +9,33 @@
<view class="jiu_01" v-if="is_bld == 1">
<view @tap="saoma">
<image class="img" src="/static/icon/1.png" mode="" ></image>
<image class="img" src="/static/icon/1.png" mode=""></image>
<view>扫码入库</view>
</view>
</view>
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/notice/notice">
<view><image class="img" src="/static/icon/newsicon.png" mode="" ></image></view>
<view>
<image class="img" src="/static/icon/newsicon.png" mode=""></image>
</view>
<view>消息通知</view>
</navigator>
</view>
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/user/tongji/tongji">
<view><image class="img" src="/static/icon/zijinicons.png" mode="" ></image></view>
<view>
<image class="img" src="/static/icon/zijinicons.png" mode=""></image>
</view>
<view>商户资金</view>
</navigator>
</view>
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/user/mingxi/mingxi">
<view><image class="img" src="/static/icon/3.png" mode="" ></image></view>
<view>
<image class="img" src="/static/icon/3.png" mode=""></image>
</view>
<view>佣金明细</view>
</navigator>
</view>
......@@ -90,7 +96,9 @@
<view class="jiu_max" v-if="shop_type == 'goods'" @tap="jump">
<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
<view class="jiu_min">
<view><image class="img" src="/static/icon/20.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/20.png" mode=""></image>
</view>
<view>商品管理</view>
</view>
<!-- </navigator> -->
......@@ -99,7 +107,9 @@
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator :url="'/pages/eleProduct/eleProduct?edit=0&activity_type='+ activity_type ">
<view class="jiu_min">
<view><image class="img" src="/static/icon/eleproduct.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/eleproduct.png" mode=""></image>
</view>
<view>外卖产品</view>
</view>
</navigator>
......@@ -109,7 +119,9 @@
<view class="jiu_max " v-if="shop_type == 'hotel'">
<navigator url="/pages/HotelManage/HotelManage">
<view class="jiu_min">
<view><image class="img" src="/static/icon/20.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/20.png" mode=""></image>
</view>
<view>酒店管理</view>
</view>
</navigator>
......@@ -119,7 +131,9 @@
<view class="jiu_max" v-if="shop_type == 'ele'">
<navigator url="/pages/shopCategory/shopCategory?type=1">
<view class="jiu_min">
<view><image class="img" src="/static/icon/eleclass.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/eleclass.png" mode=""></image>
</view>
<view>商品分类</view>
</view>
</navigator>
......@@ -129,7 +143,9 @@
<view class="jiu_max" v-if="shop_type == 'goods'">
<navigator url="/pages/storeCategory/storeCategory?type=1">
<view class="jiu_min">
<view><image class="img" src="/static/icon/6.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/6.png" mode=""></image>
</view>
<view>商品分类</view>
</view>
</navigator>
......@@ -150,7 +166,9 @@
<view class="jiu_max">
<navigator url="/pages/specs/specs?type=2">
<view class="jiu_min">
<view><image class="img" src="/static/icon/eleguige.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/eleguige.png" mode=""></image>
</view>
<view>商品规格</view>
</view>
</navigator>
......@@ -160,7 +178,9 @@
<!-- 外卖订单 -->
<navigator url="/pages/order/order">
<view class="jiu_min">
<view><image class="img" src="/static/icon/eleguanli.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
</view>
<view>订单管理</view>
</view>
</navigator>
......@@ -170,7 +190,9 @@
<!-- 商城订单 -->
<navigator url="/pages/order/shopOrder">
<view class="jiu_min">
<view><image class="img" src="/static/icon/8.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/8.png" mode=""></image>
</view>
<view>订单管理</view>
</view>
</navigator>
......@@ -181,7 +203,9 @@
<!-- 酒店的订单 -->
<navigator url="/pages/hotelOrder/hotelOrder">
<view class="jiu_min">
<view><image class="img" src="/static/icon/8.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/8.png" mode=""></image>
</view>
<view>订单管理</view>
</view>
</navigator>
......@@ -190,7 +214,9 @@
<view class="jiu_max ">
<navigator url="/pages/kehu/kehu">
<view class="jiu_min">
<view><image class="img" src="/static/icon/elesuoke.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/elesuoke.png" mode=""></image>
</view>
<view>锁客列表</view>
</view>
</navigator>
......@@ -200,7 +226,9 @@
<view class="jiu_max " v-if="shop_type == 'goods'">
<navigator url="/pages/LuckDraw/homenav/homenav">
<view class="jiu_min">
<view><image class="img" src="/static/news/liwuiocn.png" mode=""></image></view>
<view>
<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
</view>
<view>抽奖活动</view>
</view>
</navigator>
......@@ -209,7 +237,9 @@
<view class="jiu_max ">
<navigator url="/pages/CardSend/CardSend">
<view class="jiu_min">
<view><image class="img" src="/static/news/elecoup.png" mode=""></image></view>
<view>
<image class="img" src="/static/news/elecoup.png" mode=""></image>
</view>
<view>优惠券管理</view>
</view>
</navigator>
......@@ -218,7 +248,9 @@
<view class="jiu_max ">
<navigator url="/pages/Printer/AddPrinter">
<view class="jiu_min">
<view><image class="img" src="/static/news/printer.png" mode=""></image></view>
<view>
<image class="img" src="/static/news/printer.png" mode=""></image>
</view>
<view>添加打印机</view>
</view>
</navigator>
......@@ -226,39 +258,60 @@
<view class="jiu_max " @tap="shops">
<view class="jiu_min">
<view><image class="img" src="/static/news/turntable.png" mode=""></image></view>
<view>
<image class="img" src="/static/news/turntable.png" mode=""></image>
</view>
<view>大转盘</view>
</view>
</view>
<view class="jiu_max " >
<view class="jiu_max ">
<navigator url="/pages/deliveryCost/deliveryCost">
<view class="jiu_min">
<view><image class="img" src="/static/icon/psfei.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/psfei.png" mode=""></image>
</view>
<view>外卖配送费设置</view>
</view>
</navigator>
</view>
<!-- hgService.showSafeSetting(); -->
<view class="jiu_max " >
<view class="jiu_max " v-if="is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=1">
<view class="jiu_min">
<view><image class="img" src="/static/icon/editPrice.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/editPrice.png" mode=""></image>
</view>
<view>快捷改价</view>
</view>
</navigator>
</view>
<view class="jiu_max " >
<view class="jiu_max " v-if="is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=2">
<view class="jiu_min">
<view><image class="img" src="/static/icon/editStore.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/editStore.png" mode=""></image>
</view>
<view>增减库存</view>
</view>
</navigator>
</view>
<view class="jiu_max " @click="download" v-if="is_bld">
<view>
<view class="jiu_min">
<view>
<image class="img" src="/static/icon/download.png" mode=""></image>
</view>
<view>下载称重商品</view>
</view>
</view>
</view>
</view>
<view class="BH"></view>
<Welcome ref="Welcome"></Welcome>
<!-- 欢迎回来 -->
......@@ -266,23 +319,28 @@
</template>
<script>
import{getskipShop} from "@/utils/api/merchant.js";
import {
getskipShop
} from "@/utils/api/merchant.js";
import uniBadge from "@/components/uni/uni-badge/uni-badge.vue"
import uniIcon from "@/components/uni/uni-icon/uni-icon.vue"
import Welcome from "@/components/Welcome/Welcome.vue"; //欢迎回来
import {storeIndex} from "@/utils/api/api.js";
import {
storeIndex,
excel
} from "@/utils/api/api.js";
export default {
data() {
return {
tancl: false,
shop_id:"",
shop_id: "",
shop: {},
countdata: {},
shop_type: "", //店铺类型 ele goods
is_luck_draw:"",
money_type:"",
activity_type:0,
is_bld:''
is_luck_draw: "",
money_type: "",
activity_type: 0,
is_bld: ''
}
},
components: {
......@@ -297,9 +355,9 @@
},
onLoad() {
getskipShop({
type:'bld'
}).then(res=>{
if(res.code == 0){
type: 'bld'
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
......@@ -311,16 +369,16 @@
}, 2000)
//#ifdef APP-PLUS
if( (plus.device.getVolume() * 1000) < 600 ){ //获取手机音量
if ((plus.device.getVolume() * 1000) < 600) { //获取手机音量
uni.showModal({
title: '提示:音量较小',
content: '当前手机音量较小,可能无法及时获取新的订单播报,建议设置为最大音量',
success:(res)=> {
success: (res) => {
if (res.confirm) {
plus.device.setVolume(1); //设置手机音量
setTimeout(()=>{
setTimeout(() => {
this.$api.msg('设置成功');
},500)
}, 500)
}
},
......@@ -341,76 +399,102 @@
this.storeIndexfun();
if(uni.getSystemInfoSync().platform!='ios'){
getApp().getnewsRemind().then((res)=>{
if (uni.getSystemInfoSync().platform != 'ios') {
getApp().getnewsRemind().then((res) => {
console.log(res)
if(res){
if(this.$store.state.Timer==''){
let Timer=setInterval(()=>{
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
console.log('这里');
},5000);
}, 5000);
this.$store.commit('Timer',Timer);
this.$store.commit('Timer', Timer);
}
}
})
}
},
methods: {
saoma(e){
saoma(e) {
uni.scanCode({
success:res => {
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'
app_id: 'qkkbptetyohxoiod',
app_secret: 'Wkp2a3NiNjAzTFJLRmwrZXN3QW1jZz09'
},
method:'GET',
method: 'GET',
success: (results) => {
console.log(results);
if(results.data.code==0){
if (results.data.code == 0) {
// this.$api.msg(results.data.msg);
results.isScanCode=false;
results.code=res.result;
results.isScanCode = false;
results.code = res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
})
}else if(results.data.code==1){
results.isScanCode=false;
results.code=res.result;
} else if (results.data.code == 1) {
results.isScanCode = false;
results.code = res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
})
console.log(results)
}
},
fail :(results) => {
fail: (results) => {
console.log(results);
results.isScanCode=false;
results.code=res.result;
results.isScanCode = false;
results.code = res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
})
}
})
}
});
},
jump(){
jump() {
uni.navigateTo({
url:'/pages/edit/pro_manage/pro_manage?money_type='+this.money_type + '&'+'activity_type='+this.activity_type
url: '/pages/edit/pro_manage/pro_manage?money_type=' + this.money_type + '&' + 'activity_type=' + this.activity_type
})
},
shops(){
shops() {
uni.navigateTo({
url:"/pages/details/details?shop_id="+this.shop_id
url: "/pages/details/details?shop_id=" + this.shop_id
})
},
download() {
let that = this
uni.showModal({
title: '复制链接在电脑端浏览器打开',
content:`${that.$store.state.uploadurl}api/index/excel?shop_id=${this.shop_id}`,
confirmText: '复制',
success: function(res) {
if (res.confirm) {
uni.setClipboardData({
data: `${that.$store.state.uploadurl}api/index/excel?shop_id=${this.shop_id}`,
success: () => { //复制成功的回调函数
uni.showToast({ //提示
title: '复制成功'
})
}
});
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//弹窗
tan() {
......@@ -424,8 +508,8 @@
this.countdata = res.data.counts; //统计的数据
this.shop_type = res.data.shop_type; //店铺类型 商城 goods
this.shop_id = res.data.shop_info.shop_id;
this.is_luck_draw=res.data.shop_info.is_luck_draw
this.money_type=res.data.shop_info.money_type
this.is_luck_draw = res.data.shop_info.is_luck_draw
this.money_type = res.data.shop_info.money_type
this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格
} else {
......@@ -438,7 +522,7 @@
</script>
<style lang="scss">
.index {
.index {
background: #fff;
.H50 {
......@@ -568,5 +652,5 @@
border-bottom: 1px solid #f4f4f4;
font-size: 24upx;
}
}
}
</style>
utils/api/api.js
View file @ fed5ec73
......@@ -493,3 +493,12 @@ 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 @ fed5ec73
......@@ -46,3 +46,7 @@ export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true});
}
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