Skip to content

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

zxf

parents e7dcf492 f7354028
Expand all Show whitespace changes
Inline Side-by-side
Showing with 938 additions and 640 deletions
manifest.json
View file @ 563d4e49
......@@ -5,10 +5,11 @@
"description" : "商家",
"versionName" : "1.0.98",
"versionCode" : 198,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
"runtimeVersion" : "2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
"runtimeVersion" : "2.9.3,2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
"compilerVersion" : "2.9.8" //兼容的编译器版本号
},
/* 5+App特有相关weex */
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ 563d4e49
......@@ -390,44 +390,40 @@
checked:'2'
}],
ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
value: 'cate_id',
},
name: 'product',
result:[],
form: {
// mandatory:'2',
// linkage_id:'',
// //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
// specifications:'',//商品规格
// stock:'', //商品库存
// cost_price:'', //进货价钱
// code:'' ,//条形编码
// commission:'', //返佣比例
// sell_type:0,// 售卖类型
// commodity_data:{}, //原始商品名
// quality_guarantee_period:0, //保质期（月）
// manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商
// brand :'', // 品牌
// checkbox: [],//断选
// product_id:"",//修改的时候的产品id
// product_name:"",//产品名称
// desc:"",//产品描述
// cate_id:"",//产品分类id
// photo:"",//产品图片
// lunch_box_fee:'',//餐盒费
// is_new:"",//是否新产品
// is_hot:"",//是否热卖产品
// action:"add",// 方式（添加：add，修改:edit）
// price:"",//价格
// activity_price:"",//秒杀价
// store_count:"" ,// 秒杀库存
// is_seckill:"0",//0 1 是否秒杀产品
// activity_id:'0',//秒杀activity_id
// activity_list:'',//秒杀列表
// limit_num:"0" //秒杀限购数量 0 不限制
mandatory:'2',
linkage_id:'',
//cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
specifications:'',//商品规格
stock:'', //商品库存
cost_price:'', //进货价钱
code:'' ,//条形编码
commission:'', //返佣比例
sell_type:0,// 售卖类型
commodity_data:{}, //原始商品名
quality_guarantee_period:0, //保质期（月）
manufacture_date:'' , //生产日期
manufacturer :'', ///生产厂商
brand :'', // 品牌
checkbox: [],//断选
product_id:"",//修改的时候的产品id
product_name:"",//产品名称
desc:"",//产品描述
cate_id:"",//产品分类id
photo:"",//产品图片
lunch_box_fee:'',//餐盒费
is_new:"",//是否新产品
is_hot:"",//是否热卖产品
action:"add",// 方式（添加：add，修改:edit）
price:"",//价格
activity_price:"",//秒杀价
store_count:"" ,// 秒杀库存
is_seckill:"0",//0 1 是否秒杀产品
activity_id:'0',//秒杀activity_id
activity_list:'',//秒杀列表
limit_num:"0" //秒杀限购数量 0 不限制
},
timeList:[
{}
......@@ -452,13 +448,16 @@
activity_type:"",//判断是否可以秒杀
seckilltimelist:[],//秒杀时段列表
selchildList:[],
cate_name:"",
index:0,
isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入
update:true,
detail_photos:[],//详情图片
video_photos:[],//轮播图片
cate_name:"", //分类名
}
},
computed: {
......@@ -765,8 +764,15 @@
let res = await eleProductInfo({
product_id:this.product_id,
});
console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){
this.form.cate_id = res.data.cate_id;//分类id
for(var i = 0; i < this.chindformList.length; i++) {
if(this.chindformList[i].cate_id==res.data.cate_id){
this.cate_name=this.chindformList[i].cate_name;
break;
}
}
this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name;
this.defaultinfo = res.data;
......@@ -777,7 +783,7 @@
this.form.photo = res.data.photo;//图片
this.form.activity_price = res.data.activity_price //秒杀价
this.form.store_count = res.data.store_count //秒杀库存
this.form.cate_id = res.data.cate_id;//分类id
this.form.activity_id = res.data.activity_id//秒杀时段id
this.form.limit_num = res.data.limit_num
this.form.specifications = res.data.gram
......@@ -837,7 +843,6 @@
this.classValue = '';
}
//属性选默认值
if(res.data.is_new==1){
this.selchildList.push("is_new");
......@@ -875,16 +880,19 @@
}
},
getForm() {
if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
this.$api.msg("请填写完整秒杀数据");
return false;
}
if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
this.$api.msg("秒杀库存或限购数量不能为小数");
return false;
}
// if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
// this.$api.msg("请填写完整秒杀数据");
// return false;
// }
// console.log(this.form.limit_num,this.form.store_count)
// if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
// this.$api.msg("秒杀库存或限购数量不能为小数");
// return false;
// }
let can = {
action:this.product_id==''?'add':'edit',
linkage_id:this.linkage_id,
mandatory:this.form.mandatory,
gram:this.form.specifications, //商品规格
......@@ -901,7 +909,6 @@
product_name:this.form.product_name,//产品名称
desc:this.form.desc,//产品描述
lunch_box_fee:this.form.lunch_box_fee,//餐盒费
action:this.form.action,//方式（添加：add，修改:edit）
price:this.form.price,//价格
photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价
......@@ -911,6 +918,7 @@
limit_num:this.form.limit_num ,//秒杀限购数量
detail_photos:this.detail_photos,//详情图
video_photos:this.video_photos,//轮播图
cate_id:this.form.cate_id,
};
......@@ -940,11 +948,11 @@
can.is_hot = 0;
}
if(this.product_id!="" && this.is_datashow !=false ){
can.action = "edit";
can.product_id = this.product_id;
}
//添加修改外卖产品
addEditEleProduct(can).then((res1)=>{
console.log(res1,'成功了');
if(res1.code==0){
this.$api.msg(res1.msg);
setTimeout(()=>{
......@@ -953,6 +961,8 @@
}else{
this.$api.msg(res1.msg);
}
}).catch(err=>{
console.log(err,'失败了');
})
},
......
pages/index/index.vue
View file @ 563d4e49
......@@ -97,7 +97,7 @@
<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
<view class="jiu_min">
<view>
<image class="img" src="/static/icon/20.png" mode=""></image>
<image class="img" src="/static/icon/spgl.png" mode=""></image>
</view>
<view>商品管理</view>
</view>
......@@ -144,7 +144,7 @@
<navigator url="/pages/storeCategory/storeCategory?type=1">
<view class="jiu_min">
<view>
<image class="img" src="/static/icon/6.png" mode=""></image>
<image class="img" src="/static/icon/eleclass.png" mode=""></image>
</view>
<view>商品分类</view>
</view>
......@@ -191,7 +191,7 @@
<navigator url="/pages/order/shopOrder">
<view class="jiu_min">
<view>
<image class="img" src="/static/icon/8.png" mode=""></image>
<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
</view>
<view>订单管理</view>
</view>
......@@ -204,7 +204,7 @@
<navigator url="/pages/hotelOrder/hotelOrder">
<view class="jiu_min">
<view>
<image class="img" src="/static/icon/8.png" mode=""></image>
<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
</view>
<view>订单管理</view>
</view>
......@@ -227,7 +227,7 @@
<navigator url="/pages/LuckDraw/homenav/homenav">
<view class="jiu_min">
<view>
<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
<image class="img" src="/static/icon/liwuiocn.png" mode=""></image>
</view>
<view>抽奖活动</view>
</view>
......@@ -245,7 +245,7 @@
</navigator>
</view>
<view class="jiu_max ">
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/Printer/AddPrinter">
<view class="jiu_min">
<view>
......@@ -256,7 +256,7 @@
</navigator>
</view>
<view class="jiu_max " @tap="shops">
<view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
<view class="jiu_min">
<view>
<image class="img" src="/static/news/turntable.png" mode=""></image>
......@@ -265,7 +265,7 @@
</view>
</view>
<view class="jiu_max ">
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/deliveryCost/deliveryCost">
<view class="jiu_min">
<view>
......@@ -277,7 +277,7 @@
</view>
<!-- hgService.showSafeSetting(); -->
<view class="jiu_max " v-if="is_bld">
<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=1">
<view class="jiu_min">
<view>
......@@ -288,7 +288,7 @@
</navigator>
</view>
<view class="jiu_max " v-if="is_bld">
<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
<navigator url="/pages/eleProduct/eleProduct?edit=2">
<view class="jiu_min">
<view>
......@@ -300,7 +300,7 @@
</view>
<view class="jiu_max " @click="download" v-if="is_bld">
<view class="jiu_max " @click="download" v-if="shop_type == 'ele'&&is_bld">
<view>
<view class="jiu_min">
<view>
......@@ -313,11 +313,11 @@
<!-- url="/pages/publishActivities/activityList/activityList" -->
<view class="jiu_max ">
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/publishActivities/activityList/activityList">
<view class="jiu_min">
<view>
<image class="img" src="https://luma.jxdsy.cn/static/applet5/images/download.png" mode=""></image>
<image class="img" src="/static/icon/0yuan.png" mode=""></image>
</view>
<view>0元领活动</view>
</view>
......@@ -564,7 +564,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 //判断是否有秒杀资格
console.log(this.shop_type,'aa')
} else {
this.$api.msg(res.msg);
}
......
pages/order/shoporderdetail/shoporderdetail.vue
View file @ 563d4e49
......@@ -36,10 +36,10 @@
</view>
<view class="bt_min flex1">{{detail.shop_name}}</view>
</view>
<view class="flex mt-30" v-for='(item,index) in detail.products' :key='index' >
<view class="flex mt-30" v-for='(item,index) in detail.products' :key='index'>
<view class="tuimg br_10 ov">
<image class="imgs" :src="staticUrl+item.photo" v-if="item.photo"></image>
<image class="imgs" :src="staticUrl+detail.photo" v-else ></image>
<image class="imgs" :src="staticUrl+detail.photo" v-else></image>
</view>
<view class="flex1 ml-25 goodsboxs">
<view class="sz_30 bt_hei twoline names" style="height:65upx">{{item.goods_name}}</view>
......@@ -78,6 +78,7 @@
<view class="name">订单编号</view>
<view class="vlas">{{logs.order_sn}}</view>
</view>
<view class="cellitems flex ali-c jus-b">
<view class="name">创建时间</view>
<view class="vlas">{{logs.createtime}}</view>
......@@ -87,10 +88,14 @@
<view class="vlas">{{detail.refund_details}}</view>
</view>
<view class="cellitems flex ali-c jus-b" >
<view class="name" style="width: 30%;">订单备注:</view>
<view class="vlas" style="text-align: left;">{{detail.message==''?'无':detail.message}}</view>
</view>
</view>
<!-- 订单信息 -->
<!-- 联系客服 -->
<view class="ordertelbox flex ">
<view class="itemboxss flex1 flex flexc" @tap="xlsj" :data-tel='detail.addr.mobile'>
......@@ -111,17 +116,23 @@
</template>
<script>
import { orderDetails } from "@/utils/api/api.js";
import {
orderDetails
} from "@/utils/api/api.js";
export default {
data(){
data() {
return {
order_id:"",
detail:{addr:{mobile:""}},
logs:{},
order_id: "",
detail: {
addr: {
mobile: ""
}
},
logs: {},
}
},
computed: {
staticUrl () {//静态资源地址
staticUrl() { //静态资源地址
return this.$store.state.staticUrl;
}
},
......@@ -129,14 +140,14 @@
this.order_id = options.order_id;
this.initializedata();
},
methods:{
xlsj(){//联系客户
methods: {
xlsj() { //联系客户
uni.makePhoneCall({
phoneNumber: this.detail.addr.mobile //仅为示例
});
},
//联系平台
lxpt(){
lxpt() {
uni.makePhoneCall({
phoneNumber: '15907083784' //仅为示例
});
......@@ -148,10 +159,10 @@
};
orderDetails(params).then(res => {
console.log(res);
if(res.code<0){
if (res.code < 0) {
// app.showToast({title: res.msg});
this.$api.msg(res.msg);
}else{
} else {
// that.setData({
// detail: res.data.detail,
// logs:res.data.logs,
......@@ -164,7 +175,7 @@
}
})
},
callTel: function (e) {
callTel: function(e) {
uni.makePhoneCall({
phoneNumber: e.currentTarget.dataset.tel // 仅为示例，并非真实的电话号码
})
......@@ -178,26 +189,32 @@
<style lang="scss">
/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
.ml-20{
.ml-20 {
margin-left: 20upx;
}
.mt-20{
.mt-20 {
margin-top: 20upx;
}
.mr-20{
.mr-20 {
margin-right: 20upx;
}
.mt-30{
.mt-30 {
margin-top: 30upx;
}
.ml-25{
.ml-25 {
margin-left: 25upx;
}
.sz_30{
.sz_30 {
font-size: 30upx;
}
.beijingimg {
background: linear-gradient(#FF5A03,#FF4216);
background: linear-gradient(#FF5A03, #FF4216);
width: 100%;
height: 300upx;
position: absolute;
......@@ -205,140 +222,164 @@
z-index: 1;
padding-left: 20upx;
padding-top: 25px;
.onetitle{
color:#FFFFFF;
.onetitle {
color: #FFFFFF;
font-size: 30upx;
}
.twotitle{
color:#FFFFFF;
.twotitle {
color: #FFFFFF;
font-size: 28upx;
}
}
.addresone{
.addresone {
margin-top: 20px;
}
.boxs {
position: relative;
z-index:2;
z-index: 2;
width: 100%;
padding: 24upx;
box-sizing: border-box;
}
.bt_min{
.bt_min {
font-size: 30upx;
}
.addrnamesv{
.addrnamesv {
font-size: 30upx;
}
.topbox_20 {
width: 100%;
background: rgba(255,255,255,1);
background: rgba(255, 255, 255, 1);
border-radius: 14rpx;
padding: 20upx;
box-sizing: border-box;
font-size: 30upx;
}
.skunames{
.skunames {
font-size: 24upx;
}
page{
page {
position: relative;
padding-bottom: 100upx;
background: #F5F5F5;
}
.weizhiimg{
.weizhiimg {
width: 30upx;
height: 46upx;
.imgs{
.imgs {
width: 30upx;
height: 46upx;
}
}
.shuwuimg{
width:67upx;
height:67upx;
border-radius:4upx;
.shuwuimg {
width: 67upx;
height: 67upx;
border-radius: 4upx;
overflow: hidden;
}
.btbox{
width:190upx;
height:77upx;
background:rgba(255,255,255,1);
border-radius:4upx;
.btbox {
width: 190upx;
height: 77upx;
background: rgba(255, 255, 255, 1);
border-radius: 4upx;
}
.xiangyouimg{
width:14upx;
height:24upx;
.xiangyouimg {
width: 14upx;
height: 24upx;
}
.dianhuimg{
width:42upx;
height:42upx;
.dianhuimg {
width: 42upx;
height: 42upx;
}
.kuai{
width:40upx;
height:40upx;
.kuai {
width: 40upx;
height: 40upx;
text-align: center;
line-height: 40upx;
font-size:24upx;
font-weight:500;
color:rgba(255,255,255,1);
font-size: 24upx;
font-weight: 500;
color: rgba(255, 255, 255, 1);
}
.dibu_qr{
.dibu_qr {
position: fixed;
bottom: 0;
width:100%;
background:rgba(255,255,255,1);
width: 100%;
background: rgba(255, 255, 255, 1);
padding: 10upx 24upx;
box-sizing: border-box;
}
.beizhu{
.beizhu {
width: 150upx;
text-align: right;
}
.tubiimg{
width:27upx;
height:24upx;
.imgs{
width:27upx;
height:24upx;
.tubiimg {
width: 27upx;
height: 24upx;
.imgs {
width: 27upx;
height: 24upx;
}
}
.tuimg{
width:183upx;
height:183upx;
.imgs{
width:183upx;
height:183upx;
.tuimg {
width: 183upx;
height: 183upx;
.imgs {
width: 183upx;
height: 183upx;
}
}
view{
view {
line-height: 112%;
letter-spacing:3upx
letter-spacing: 3upx
}
.dianhuimg{
width:43upx;
height:43upx;
.dianhuimg {
width: 43upx;
height: 43upx;
}
.shuxian{
width:1px;
height:100upx;
background:rgba(242,242,242,1);
.shuxian {
width: 1px;
height: 100upx;
background: rgba(242, 242, 242, 1);
}
.duanxian{
width:45upx;
height:1px;
background: rgba(181,181,181,1);
.duanxian {
width: 45upx;
height: 1px;
background: rgba(181, 181, 181, 1);
}
.cptjimg{
width:100%;
height:310upx;
.cptjimg {
width: 100%;
height: 310upx;
}
/* 取消弹窗 */
.zan-dialog__mask {
position: fixed;
......@@ -373,91 +414,106 @@
display: block;
}
.goodsboxs{
.goodsboxs {
font-size: 30upx;
.names{
.names {
font-size: 30upx;
}
.prices{
.prices {
font-size: 30upx;
}
.sumns{
color:rgb(192, 190, 190);
.sumns {
color: rgb(192, 190, 190);
}
}
//联系kefu 客服
.ordertelbox{
.ordertelbox {
margin: 0 24upx;
margin-top: 20upx;
height:89upx;
background:rgba(255,255,255,1);
border-radius:0px 0px 14upx 14upx;
.itemboxss{
height: 89upx;
background: rgba(255, 255, 255, 1);
border-radius: 0px 0px 14upx 14upx;
.itemboxss {
position: relative;
height: 89upx;
line-height: 89upx;
.img{
width:43upx;
height:43upx;
.img {
width: 43upx;
height: 43upx;
margin-right: 20upx;
}
.name{
font-size:30upx;
color:rgba(0,0,0,1);
.name {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
}
.itemboxss:nth-child(1):after{
.itemboxss:nth-child(1):after {
content: "";
width:1px;
height:89px;
background:rgba(242,242,242,1);
width: 1px;
height: 89px;
background: rgba(242, 242, 242, 1);
position: absolute;
top:0;
top: 0;
right: 0;
}
}
//客服end
//价格明细列表
.cellboxs{
.cellboxs {
margin: 20upx 0;
margin-top: 20upx;
.cellitems{
.cellitems {
padding: 0 20upx;
height: 88upx;
line-height: 88upx;
border-bottom: 1px solid #F5F1F1;
background: #FFFFFF;
.name{
font-size:30upx;
color:rgba(0,0,0,1);
.name {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
.vlas{
font-size:30upx;
color:rgba(0,0,0,1);
.vlas {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
}
.cellitems:nth-last-child(1){
border:0;
.cellitems:nth-last-child(1) {
border: 0;
}
.subsbox{
.name{
font-size:30upx;
font-family:PingFang SC;
font-weight:bold;
color:rgba(0,0,0,1);
.subsbox {
.name {
font-size: 30upx;
font-family: PingFang SC;
font-weight: bold;
color: rgba(0, 0, 0, 1);
}
.vlas{
color:#FF6900;
.fuhao{
.vlas {
color: #FF6900;
.fuhao {
font-size: 30upx;
}
.shuzi{
font-family:PingFang SC;
font-weight:bold;
.shuzi {
font-family: PingFang SC;
font-weight: bold;
font-size: 36upx;
}
}
......
pages/publishActivities/activityList/activityList.vue
View file @ 563d4e49
......@@ -23,7 +23,9 @@
</label> -->
<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
<view class="infobox" style="width: 70%;">
<view class="title oneline" style="height:44upx ;">{{item.goods_name}}</view>
<view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view>
<view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
......@@ -49,7 +51,7 @@
</view>
<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
快发布活动吧~~
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view>
</view>
......@@ -86,7 +88,7 @@
</checkbox-group>
</view>
<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
没有过期活动~~
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view>
</view>
......
static/icon/20.png
View replaced file @ e7dcf492 View file @ 563d4e49
static/icon/20.png

4.24 KB | W: | H:

static/icon/20.png

1.81 KB | W: | H:

static/icon/20.png
static/icon/20.png
static/icon/20.png
static/icon/20.png
  • 2-up
  • Swipe
  • Onion skin
utils/debug.js
View file @ 563d4e49
......@@ -4,25 +4,14 @@ module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:false,//正式
// isdebug:true,//测试
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式
// #endif
/**
* PS
*
* 正式环境 选 false !
* 本地开发环境 选 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