Commit 1a09da2f authored by home's avatar home

zxf

parent 3dfd128b
......@@ -2,8 +2,8 @@
"name" : "鹿马商家助手",
"appid" : "__UNI__1EA80F1", //这个是 web
"description" : "商家",
"versionName" : "1.112",
"versionCode" : 1112,
"versionName" : "1.114",
"versionCode" : 1114,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持
......@@ -133,9 +133,9 @@
},
"splashscreen" : {
"android" : {
"hdpi" : "F:/1a证书/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "F:/1a证书/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "F:/1a证书/证书/d0abce82961b508e6a0b9924d15fe86.png"
"hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
},
"ios" : {
"iphone" : {
......
......@@ -482,6 +482,42 @@
}
}
,{
"path" : "pages/table_code/table_code/table_code",
"style" :
{
"navigationBarTitleText": "餐台二维码",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/table_code/manageTableCode/manageTableCode",
"style" :
{
"navigationBarTitleText": "餐台管理",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/table_code/addTableCode/addTableCode",
"style" :
{
"navigationBarTitleText": "添加餐台码",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/table_code/tableCodeList/tableCodeList",
"style" :
{
"navigationBarTitleText": "餐台码列表",
"enablePullDownRefresh": true
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
......
......@@ -88,9 +88,19 @@
<view class="shuju_01_s" v-if="countdata.yesterday_cash">¥ {{ countdata.yesterday_cash }}</view>
<view class="shuju_01_s" v-else>¥0</view>
</view>
</navigator>
<!-- <navigator url="/pages" class="shuju">
<view class="shuju_01">
<view>我的股票</view>
</view>
<view class="shuju_01 no">
<view>我的股权</view>
</view>
</navigator> -->
<view class="BH"></view>
<view class="six">
<view class="jiu_max" v-if="shop_type == 'goods'" @tap="jump">
......@@ -336,6 +346,16 @@
</view>
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/table_code/manageTableCode/manageTableCode">
<view class="jiu_min">
<view>
<image class="img" src="/static/table_code/tableCode.png" mode=""></image>
</view>
<view>餐台码</view>
</view>
</navigator>
</view>
</view>
......@@ -388,9 +408,9 @@
},
onLoad() {
//显示欢迎回来~
setTimeout(() => {
this.$refs.Welcome.show();
}, 2000)
// setTimeout(() => {
// this.$refs.Welcome.show();
// }, 2000)
//#ifdef APP-PLUS
if ((plus.device.getVolume() * 1000) < 600) { //获取手机音量
......@@ -434,8 +454,6 @@
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
}
})
this.storeIndexfun();
......@@ -630,6 +648,7 @@
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 {
this.$api.msg(res.msg);
}
......
......@@ -69,12 +69,12 @@
this.windowHeight=uni.getSystemInfoSync().windowHeight;
this.rpx=uni.getSystemInfoSync().windowWidth/375;
this.shop_id = opdata.shop_id;
this.shopname = opdata.shop_name;//商品名称
this.shop_name = uni.getStorageSync('userInfo').shop_name //店铺名称
this.createGoodsQrcode();
},
methods: {
filePath(type,wxType){
if(this.imgUrl==''){ ///没保存
if(this.imgUrl==''){ //没保存
uni.showLoading({title:'正在保图片...'});
uni.canvasToTempFilePath({ //保存canvas
canvasId:'myCanvas',
......@@ -187,6 +187,7 @@
}
},
imgH(e){
this.bgHeight=e.detail.height/2; //得到背景图高度
},
......@@ -228,7 +229,7 @@
avater(qrcodeurl){ //主图下载
uni.showLoading({title:'图片下载中...',mask:true});
uni.downloadFile({ //下载图片到本地
url:this.statictowUrl+"static/applet5/images/uts/sjrwm.png",//背景主图片, //主图
url:this.statictowUrl+"static/applet5/images/uts/shop_background.png",//背景主图片, //主图
success:res=>{
uni.hideLoading();
if(res.statusCode==200){ //下载成功
......@@ -256,15 +257,20 @@
console.log(qrcodeurl,avaterSrc)
if(avaterSrc){//主图
ctx.drawImage(avaterSrc,0,0,this.windowWidth,this.bgHeight);
}
// ctx.setFontSize( 11.94)
// ctx.setFillStyle("#FFFFFF")
// ctx.fillText(this.shop_name, 184+34.5, 97.5 + 11.94,)
}
if(qrcodeurl){//二维码
ctx.drawImage(qrcodeurl, (this.windowWidth-210*rpx)/2, 220, 210*rpx, 220*rpx);
}
if(this.shopname){//店铺名字
if(this.shop_name){//店铺名字
ctx.setTextAlign('center')
ctx.setFillStyle('#ffffff');
ctx.setFontSize((18*rpx).toFixed(0));
ctx.fillText(this.shopname,(this.windowWidth-ctx.measureText(this.shopname).width)/2,470);
ctx.setFontSize((22*rpx).toFixed(0));
ctx.fillText(this.shop_name,(this.windowWidth-ctx.measureText(this.shopname).width)/2,470);
}
uni.hideLoading();
ctx.draw();
......
<template>
<view class="w1005">
<view class="flex" style="padding: 20upx 24upx;background-color: #fff;margin-bottom: 20rpx;">
<view class="">
开始桌号:
</view>
<view class="">
<input type="number" v-model="startName" placeholder="桌号 整数" placeholder-style="font-size:24upx" />
</view>
</view>
<view class="flex" style="padding: 20upx 24upx;background-color: #fff;margin-bottom: 20rpx;">
<view class="">
结束桌号:
</view>
<view class="">
<input type="number" v-model="endName" placeholder="桌号 整数" placeholder-style="font-size:24upx" />
</view>
</view>
<button class="submitbtn" type="default" @click="addTable">添加桌码</button>
</view>
</template>
<script>
import {
addTable
} from "@/utils/api/api.js";
export default {
data() {
return {
startName:'',
endName:''
}
},
onLoad() {
// this.addTable('add', '05');
},
onShow() {
},
methods: {
//name,修改 传 table_id
addTable() {
let that = this
if(this.tableName == ""){
uni.showToast({
title:"请填写桌号",
icon:"none"
})
return;
}
uni.showLoading({
title:'正在添加,请稍后...'
})
addTable({
name: that.startName,
end_name:that.endName
}).then(res => {
if(res.code==0){
uni.hideLoading()
uni.showToast({
title:res.msg,
icon:"none",
success() {
that.startName = '',
that.endName =''
}
})
}
})
},
}
}
</script>
<style>
.submitbtn {
margin: 60upx 24upx;
height: 88upx;
line-height: 88upx;
text-align: center;
background: #f64f15;
border-radius: 6upx;
font-size: 32upx;
color: rgba(255, 255, 255, 1);
}
</style>
/* 页面左右间距 */
$page-row-spacing: 30upx;
$page-color-base: #f8f8f8;
/* 文字尺寸 */
$font-base: 28upx;
$font-lg: 32upx;
/*文字颜色*/
$font-color-dark: #303133;
$font-color-light: #909399;
/* 边框颜色 */
/* 图片加载中颜色 */
/* 行为相关颜色 */
$uni-color-primary:#fa436a;
page{
background: $page-color-base;
}
.list-cell{
display:flex;
align-items:center;
padding: 20upx $page-row-spacing;
line-height:60upx;
position:relative;
background: #fff;
justify-content: center;
&.log-out-btn{
padding-top: 100upx;box-sizing: border-box;
.cell-tit{
color: $uni-color-primary;
text-align: center;
margin-right: 0;
}
}
&.cell-hover{
background:#fafafa;
}
&.b-b:after{
left: 30upx;
}
&.m-t{
margin-top: 16upx;
}
.cell-more{
align-self: baseline;
font-size:$font-lg;
color:$font-color-light;
margin-left:10upx;
}
.cell-tit{
flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;
margin-right:10upx;
}
.cell-tip{
font-size: $font-base;
color: $font-color-light;
}
switch{
transform: translateX(16upx) scale(.84);
}
.jiantousi{
width: 40upx;
height: 40upx;
}
}
.list-cell.b-b:after {
left: 30upx;
}
.b-b:after {
bottom: 0;
}
.b-b:after, .b-t:after {
position: absolute;
z-index: 3;
left: 0;
right: 0;
height: 0;
content: '';
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
border-bottom: 1px solid #E4E7ED;
}
.log-out-btncolor{
color:#fff !important;
}
.button{
width: 98%;
height: 80upx;margin: 0 auto;background-color: #ff6900;text-align: center;line-height: 80upx;border-radius: 50upx;
}
\ No newline at end of file
<template>
<!-- 设置页面 -->
<view class="setup">
<view class="container">
<navigator url="/pages/table_code/tableCodeList/tableCodeList" 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 url="/pages/table_code/addTableCode/addTableCode" 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>
</view>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {
};
},
onLoad() {
},
computed: {
//选中状态
ischecked() {
return this.$store.state.isvoice;
},
debug() {
return debug;
}
},
methods:{
}
}
</script>
<style lang="scss">
@import "./manageTableCode.scss";
</style>
<template>
<view class="flex-wrap jus-b" style="margin:24upx">
<view v-for="(item,index) in tableList" class="" @click="findCode(item.qr_code,item.name)" style="width: 49%;text-align: center;margin-bottom: 20upx;background-color: #FFFFFF;border-radius: 24upx;">
<view class="" style="font-size: 24upx;padding: 34upx 0;">
桌位号
</view>
<view class="" style="font-weight: bold;color: #F64F15;font-size: 100upx;">
{{item.name}}
</view>
<view class="flex jus-b" style="width: 80%;font-size: 32upx;margin: 24rpx auto 44upx;">
<view @click.stop="delcode(item.table_id,index)" style="color: #808080;background-color: #E0E0E0;padding: 2rpx 34upx;border-radius: 24upx;">删除</view>
<view @click.stop="showedit(item.table_id)" style="color: #FFFFFF;background-color: #F64F15;padding: 2rpx 34upx;border-radius: 24upx;">修改</view>
</view>
</view>
<uni-popup ref="popup" type="center">
<view class="" style="background-color: #EEEEEE;padding:44upx 24upx 1upx 24upx;border-radius: 20upx;">
<view class="flex" style="padding: 20upx 24upx;background-color: #fff;margin-bottom: 20rpx;border-radius: 10upx;">
<view class="">
桌号:
</view>
<view class="">
<input type="text" v-model="name" placeholder="桌号三位数 例如:001,002" placeholder-style="font-size:24upx" />
</view>
</view>
<button class="submitbtn" type="default" @click="editcode">确认修改</button>
</view>
</uni-popup>
</view>
</template>
<script>
import {
eleTable,
deleteTable,
addTable as editTable
} from "@/utils/api/api.js";
import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default {
data() {
return {
tableList: [],
name: ''
}
},
components: {
uniPopup
},
onShow() {
},
//下拉刷新
onPullDownRefresh() {
this.eletable();
uni.stopPullDownRefresh();
},
onLoad() {
this.eletable();
},
methods: {
findCode(qr_code, name) {
console.log(qr_code)
uni.navigateTo({
url: `/pages/table_code/table_code/table_code?codeurl=${qr_code}&name=${name}`
})
},
eletable() {
eleTable({}).then(res => {
if (res.code == 0) {
this.tableList = res.data
}
})
},
delcode(table_id, index) {
let that = this
uni.showModal({
title: '提示',
content: '确定删除?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '正在删除'
})
deleteTable({
table_id: table_id
}).then(res => {
if (res.code == 0) {
uni.hideLoading()
uni.showToast({
title: res.msg,
icon: "none",
success() {
// that.tableList.splice(index,0)
that.eletable();
}
})
}
})
}
}
});
},
showedit(table_id) {
this.$refs.popup.open();
this.table_id = table_id
},
editcode() {
let that = this
uni.showLoading({
title: "正在修改"
})
editTable({
name: that.name,
table_id: that.table_id
}).then(res => {
if (res.code == 0) {
uni.hideLoading()
uni.showToast({
title: res.msg,
icon: "none",
success() {
that.eletable();
that.$refs.popup.close();
that.name = ""
}
})
}
});
}
},
}
</script>
<style>
.submitbtn {
margin: 60upx 24upx;
height: 88upx;
line-height: 88upx;
text-align: center;
background: #f64f15;
border-radius: 6upx;
font-size: 32upx;
color: rgba(255, 255, 255, 1);
}
</style>
This diff is collapsed.
......@@ -26,8 +26,8 @@ if(debug.isdebug==true){
obj = {
staticUrl:"https://luma.jxdsy.cn/attachs/",//图片静态资源地址
staticUrl1:"https://zxluma.jxdsy.cn/attachs/",
joinurl:"https://luma.jxdsy.cn/static/applet5/",//关于我们里面的url
statictowUrl:"https://luma.jxdsy.cn/",//域名
joinurl:"https://luma.jxdsy.cn/static/applet5/",//关于我们里面的url https://luma.jxdsy.cn/static/applet5/images/uts/sjrwm.png
statictowUrl:"https://luma.jxdsy.cn/",//域名
staticFile:"static/applet5/images/bank/",//图片路径
uploadurl:"https://zxluma.jxdsy.cn/",//上传图片的地址 用在上传图片组件
uploadurl1:"https://zxluma.jxdsy.cn/",
......
......@@ -532,3 +532,33 @@ export function excel(data)
{
return request.post("index/excel",data,{ noAuth : true});
}
/**
* 查看餐台二维码
* @param {} data
*/
export function eleTable(data)
{
return request.post("eleTable/eleTable",data,{ noAuth : true});
}
/**
* 添加餐台码
* @param {Object} data
*/
export function addTable(data)
{
return request.post("eleTable/addTable",data,{ noAuth : true});
}
/**
* 删除餐台码
* @param {Object} data
*/
export function deleteTable(data)
{
return request.post("eleTable/deleteTable",data,{ noAuth : true});
}
......@@ -4,8 +4,8 @@ module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
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