Skip to content

L
lumastoreapp
Commit d860216c authored by srf's avatar srf
Browse files
Options

srf

parent 34a2dac3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2135 additions and 9 deletions
pages.json
View file @ d860216c
...@@ -369,6 +369,20 @@ ...@@ -369,6 +369,20 @@
"style" : { "style" : {
"navigationBarTitleText": "外卖配送费设置" "navigationBarTitleText": "外卖配送费设置"
} }
},{
"path":"pages/details/details",
"style" : {
//机型列表
"navigationBarTitleText": "大转盘",
"navigationBarBackgroundColor":"#FFFFFF"
}
},{
"path":"pages/myStore/delivery",
"style" : {
//机型列表
"navigationBarTitleText": "物流发货",
"navigationBarBackgroundColor":"#FFFFFF"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
pages/details/details.scss 0 → 100644
View file @ d860216c
.head {
margin: 24upx;
height: 150upx;
background-color: #ffffff;
border-radius: 10upx;
.flex1 {
margin: auto;
.head_1 {
width: 120upx;
height: 120upx;
margin: 0 40upx 0 20upx;
}
}
.head_2 {
flex: 3;
align-items: center;
justify-content: center;
.head_2_1 {
margin: 24upx 0 24upx 0;
font-size: 30upx;
font-weight: bold;
}
.head_2_2 {
font-size: 30upx;
font-weight: bold;
// display: flex;
.head_2_1 {
margin: 0 40upx 0 0;
background-color: #f64f15;
border-radius: 10upx;
padding: 4upx 10upx 4upx 10upx;
color: #ffffff;
}
}
}
}
// 2222222
.head_1 {
margin: 24upx;
.bonus {
font-size: 36upx;
font-weight: bold;
padding: 24upx;
color: #f64f15;
}
.bonus_1 {
background-color: #ffffff;
.bonus_1_1 {
padding: 20upx;
display: flex;
align-items: center;
.bonus_1_1_1{
font-size:28upx;
flex: 2;
// color: #f64f15;
font-weight: bold;
}
.bonus_1_1_1_1{
margin-left: 30upx;
flex: 4;
}
.nome{
display: none;
}
.input_1{
flex: 1;
font-size: 28upx;
font-weight: bold;
}
}
.bonus_1_2 {
padding: 20upx;
display: flex;
}
}
.input{
font-size: 28upx;
}
.bonus_2 {
height: 320upx;
background-color: #ffffff;
display: flex;
justify-content: center;
.bonus_img {
width: 100upx;
height: 80upx;
}
.bonus_2_1 {
margin: 10upx;
font-weight: bold;
font-size: 32upx;
color: rgba(102, 102, 102, 1);
}
}
}
.bonus_3 {
height: 160upx;
align-items: center;
.bonus_1_2 {
width: 50upx;
height: 50upx;
}
.bonus_3_1 {
margin-top: 10upx;
}
.bonus_3_2 {
margin: 0 20upx 0 20upx;
font-size: 32upx;
font-weight: 600;
}
}
.inputbox{
position: relative;
width:250upx;
// height:72upx;
border:1px solid rgba(181,181,181,1);
margin-left: 20upx;
.jiantouicon{
position: absolute;
top: 4px;
right: 8upx;
width: 22upx;
height: 24upx;
}
}
.bonus_4 {
height: 720upx;
background-color: #ffffff;
padding-left: 24rpx;
.box{
display: flex;
align-items: center;
.box_1{
font-size: 28upx;
// color: #f64f15;
font-weight: bold;
}
}
.box_2{
font-size:28upx;
font-weight: bold;
}
.bonus_4_1 {
padding: 20upx;
// border-bottom: 2upx solid red;
}
}
.bonus_5 {
// height: 80rpx;
line-height: 80upx;
background-color: #f64f15;
border-radius: 10upx;
text-align: center;
margin-top: 100upx;
}
.bonus_5_1 {
color: #ffffff;
font-weight: bold;
background-color: #f64f15;
}
// 列表
image {
width: 100%;
height: 100%;
}
.ali-f {
display: flex;
align-items: flex-end;
}
.goods_item {
// display: flex;
margin-bottom: 10upx;
border-radius: 14upx;
background: #ffffff;
padding: 24upx;
// box-sizing: border-box;
// margin: 80upx;
// width: 100%;
// height:506upx;
.thumbnail {
width: 200upx;
height: 200upx;
position: relative;
.pmimg {
width: 200upx;
height: 200upx;
position: absolute;
left: 10upx;
top: 0;
margin: 0 20upx 0 0;
}
}
.body_goods {
position: relative;
padding: 0 0 0 30upx;
flex: 1;
.shopname {
color: rgba(0, 0, 0, 1);
margin-bottom: 20upx;
font-weight: bold;
font-size: 32upx;
.twoline_s {
font-weight: bold;
font-size: 32upx;
margin: 0 20upx 0 0;
}
}
.flexbox {
display: flex;
align-items: center;
}
.hongkng {
font-size: 32upx;
font-weight: 500;
line-height: 32upx;
}
.hongkngs {
padding: 0 10upx;
height: 32upx;
background-color: #ff6900;
border-radius: 6upx;
font-size: 22upx;
font-weight: 400;
color: #ffffff;
line-height: 36upx;
text-align: center;
margin-right: 20upx;
margin-bottom: 10upx;
}
.gmbtnimg {
width: 36upx;
height: 36upx;
}
.gmbtn {
width: 144upx;
height: 44upx;
background: rgba(255, 0, 0, 1);
border-radius: 6upx;
font-size: 30upx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 44upx;
text-align: center;
}
.goods_foot {
position: absolute;
padding: 0 0 0 30upx;
box-sizing: border-box;
width: 100%;
bottom: 0;
left: 0;
.prciebox {
color: #f64f15;
.fuhao {
font-size: 26upx;
line-height: 110%;
}
.shuzi {
font-size: 34upx;
font-weight: bold;
line-height: 110%;
padding: 10upx 30upx 10upx 30upx;
border-radius: 10upx;
background-color: rgb(252, 204, 187);
color: #f64f15;
}
}
.xiaol {
font-size: 26upx;
color: rgba(153, 153, 153, 1);
margin-left: 10upx;
text-decoration: line-through;
line-height: 110%;
}
}
}
}
.base {
height: 100upx;
background: #ffffff;
border-radius: 6upx;
// margin: 24upx;
display: flex;
justify-content:space-between;
align-items: center;
// padding: 24upx;
font-weight: bold;
font-size: 32rpx;
.base_1{
background-color: rgb(252, 204, 187);
color: #f64f15;
padding: 10upx 30upx 10upx 30upx;
border-radius: 10upx;
}
.opa{
opacity: 0.6;
}
}
.gmbtns{
width: 160upx;
height: 50upx;
background: #f64f15;
border-radius: 6upx;
font-size: 30upx;
font-weight: 400;
color: #ffffff;
line-height: 50upx;
text-align: center;
padding: 0;
}
.message{
}
\ No newline at end of file
pages/details/details.vue 0 → 100644
View file @ d860216c
This diff is collapsed.
pages/index/index.vue
View file @ d860216c
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!-- 商家助手首页 --> <!-- 商家助手首页 -->
<view class="index"> <view class="index">
<view class="head"> <view class="head">
<!-- @tap="demoaudio" -->
<view class="tit">店铺名称:{{storeinfo.shop_name}} </view> <view class="tit">店铺名称:{{storeinfo.shop_name}} </view>
<!-- {{shop.shop_name}} --> <!-- {{shop.shop_name}} -->
<view class="jiu"> <view class="jiu">
...@@ -239,17 +240,15 @@ ...@@ -239,17 +240,15 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max" v-if="shop_type=='ele'"> <view class="jiu_max " @tap="shops">
<!-- 外卖配送费设置 --> <!-- <navigator url="/pages/details/details"> -->
<navigator url="/pages/deliveryCost/deliveryCost">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/psfei.png" mode=""></image> <image class="img" src="/static/turntable/turntable.png" mode=""></image>
</view> </view>
<view>配送费设置</view> <view>大转盘</view>
</view> </view>
<!-- </navigator> -->
</navigator>
</view> </view>
</view> </view>
...@@ -280,9 +279,11 @@ ...@@ -280,9 +279,11 @@
return { return {
tancl: false, tancl: false,
shop_id:"",
shop: {}, shop: {},
countdata: {}, countdata: {},
shop_type: "", //店铺类型 ele goods shop_type: "", //店铺类型 ele goods
is_luck_draw:""
} }
}, },
components: { components: {
...@@ -329,19 +330,88 @@ ...@@ -329,19 +330,88 @@
}, 1000) }, 1000)
}, },
methods: { methods: {
shops(){
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('用户点击取消');
}
}
});
}
},
demoaudio() {
//语音提醒
//AudioVoice openVoice
// setInterval(()=>{
// this.$store.dispatch('AudioVoice',"您有新的资金变化,请注意查看").then((e) => {
// console.log(e);
// })
// },10000);
this.$store.dispatch('AudioVoice', "您有新的订单,请注意查看").then((e) => {
console.log(e);
//震动 调用
//400ms
//长震动
uni.vibrateLong({
success: (re) => {
},
fail: (a) => {
}
})
// 短震动
//15ms
// uni.vibrateShort()({
// success:(re)=> {
// },
// fail:(a)=> {
// }
// })
})
},
//弹窗 //弹窗
tan() { tan() {
this.tancl = !this.tancl this.tancl = !this.tancl
}, },
//获取首页的数据 //获取首页的数据
async storeIndexfun() { async storeIndexfun() {
let res = await storeIndex({ let res = await storeIndex({
}); });
uni.stopPullDownRefresh(); //结束下拉刷新 uni.stopPullDownRefresh(); //结束下拉刷新
console.log(res.data.shop_info.shop_id)
if (res.code == 0) { if (res.code == 0) {
this.countdata = res.data.counts; //统计的数据 this.countdata = res.data.counts; //统计的数据
this.shop_type = res.data.shop_type; //店铺类型 商城 goods 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
} else { } else {
this.$api.msg(res.msg); this.$api.msg(res.msg);
......
pages/myStore/delivery.scss 0 → 100644
View file @ d860216c
//快速发货
.delivery{
min-height: 100vh;
background: #F2F3F3;
padding: 20upx 0;
}
.fahuobox{
margin: 0 24upx;
padding: 0 20upx;
padding-bottom: 60upx;
background: #FFFFFF;
.selectcell{
height: 107upx;
line-height: 107upx;
border-bottom: 1px solid #F4F4F4;
.names{
font-size:30upx;
color:rgba(0,0,0,1);
}
.icons1{
width:48upx;
height:38upx;
margin-right: 26upx;
}
.icons2{
width:10upx;
height:18upx;
}
.icons3{
width:39upx;
height:42upx;
margin-right: 26upx;
}
.tosaomaboxs{
width: 50px;
text-align: right;
}
.icons4{
width:25upx;
height:25upx;
}
}
}
.btnsbox{
margin-top: 60upx;
.btns{
width:300upx;
height:90upx;
line-height: 90upx;
text-align: center;
border:1px solid rgba(160,160,160,1);
border-radius:6upx;
font-size:32upx;
color:rgba(0,0,0,1);
}
.btns1{
border:0;
background: #FF6600;
color:#FFFFFF;
}
}
\ No newline at end of file
pages/myStore/delivery.vue 0 → 100644
View file @ d860216c
<template>
<!-- 快速发货 -->
<!-- 发货 -->
<view class="delivery fahuo yocode">
<view class="fahuobox">
<picker @change="bindPickerChange" :value="index" :range="logsitslist">
<view class="selectcell flex ali-c jus-b">
<view class="flex ali-c">
<image class="icons1" src="../../static/store/fahuo.png" mode=""></image>
<view class="names">{{chindtext==''?'选择快递公司':chindtext}}</view>
</view>
<image class="icons2" src="/static/store/xiala.png" mode=""></image>
</view>
</picker>
<view class="selectcell flex ali-c jus-b">
<view class="flex ali-c">
<image class="icons3" src="../../static/store/dindhao.png" mode=""></image>
<input class="names" type="text" value="" v-model="logscode" placeholder="输入快递单号" />
</view>
<view @tap="tosaoyisao" class="tosaomaboxs">
<image class="icons4" src="../../static/store/saoma.png" mode=""></image>
</view>
</view>
<view class="btnsbox flex ali-c jus-a">
<view class="btns">取消</view>
<view class="btns btns1" @tap="showsend">确定发货</view>
</view>
</view>
</view>
</template>
<script>
import { logisticsList, oneKeyShipments } from '@/utils/api/hotel.js';
import { showsend } from '@/utils/api/merchant.js';
export default{
data(){
return{
logsitslist:[],
index:0,
chindtext:"",
logscode:"",
shop_id:'',//厂家id
}
},
onLoad(opdata) {
console.log(opdata)
this.order_id = opdata.order_id;
this.shop_id = opdata.shop_id;
this.logisticsList();
},
methods:{
async logisticsList(){
let res = await logisticsList({
});
if(res.code==0){
this.logsitslist =res.data;
}else{
this.$api.msg(res.msg);
}
},
//快速发货 确认发货
async showsend(){
// if(this.order_id.replace(/\s*/g,"")==""){
// this.$api.msg("没有获取到您的订单信息");
// return false;
// }
if(this.chindtext==""){
this.$api.msg("请选中快速公司");
return false;
}
if(this.logscode==""){
this.$api.msg("物流单号不能为空");
return false;
}
let res = await showsend({
logisticCode:this.logscode,//物流好
shipperName:this.chindtext,//名称
order_id:this.order_id,
shop_id:this.shop_id,
});
if(res.code==0){
uni.showModal({
title: '提示',
content: res.msg,
showCancel: false,
success(res) {
uni.redirectTo({
url: '/pages/details/details'
})
// uni.navigateBack({
// //delta: 2
// });
}
})
}else{
this.$api.msg(res.msg);
}
},
//请求end
bindPickerChange(e){
console.log(e.detail.value);
this.chindtext = this.logsitslist[e.detail.value];
},
//扫码方法
tosaoyisao(){
uni.scanCode({
success: (res)=> {
console.log('条码类型：' + res.scanType);
console.log('条码内容：' + res.result);
// let qrcodecon =
this.logscode = res.result;
}
});
}
}
}
</script>
<style lang="scss">
@import "./delivery.scss"
</style>
\ No newline at end of file
utils/api/LuckDraw.js
View file @ d860216c
...@@ -55,3 +55,7 @@ import request from "./../request.js";//这里用的是two ...@@ -55,3 +55,7 @@ import request from "./../request.js";//这里用的是two
export function slotuserList(data) { export function slotuserList(data) {
return request.post("LotteryActive/userList", data, { noAuth: false ,isurltwo:true}); return request.post("LotteryActive/userList", data, { noAuth: false ,isurltwo:true});
} }
// 大转盘
export function addTurntableActivity(data) {
return request.post("Turntable/addTurntableActivity", data, { noAuth: false ,isurltwo:true});
}
\ No newline at end of file
utils/api/hotel.js
View file @ d860216c
...@@ -83,3 +83,16 @@ export function affirmIntake(data) ...@@ -83,3 +83,16 @@ export function affirmIntake(data)
{ {
return request.post("order/affirmIntake",data,{ noAuth : false}); return request.post("order/affirmIntake",data,{ noAuth : false});
} }
/**
* 查询物流公司
*/
export function logisticsList(data) {
return request.post("turntable/logisticsList", data, { noAuth: false });
}
/**
* 一键发货
*/
// export function oneKeyShipments(data) {
// return request.post("Store/oneKeyShipments", data, { noAuth: false });
// }
utils/api/merchant.js 0 → 100644
View file @ d860216c
//抽奖相关的接口
import request from "./../request.js";//这里用的是two
// 大转盘
export function addTurntableActivity(data) {
return request.post("Turntable/addTurntableActivity", data, { noAuth: true});
}
//已发布
export function getTurntableActivityList(data) {
return request.post("Turntable/getTurntableActivityList", data, { noAuth: true});
}
//中奖区
export function getShopLuckDrawList(data) {
return request.post("Turntable/getShopLuckDrawList", data, { noAuth: true});
}
//抽奖劵
// export function getBuyRecord(data) {
// return request.post("Turntable/getBuyRecord", data, { noAuth: true});
// }
//状态
export function setTurntableActivityStatus(data) {
return request.post("Turntable/setTurntableActivityStatus", data, { noAuth: true});
}
// 订单号
export function showsend(data) {
return request.post("Turntable/send", data, { noAuth: true});
}
\ No newline at end of file
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