Skip to content

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

zxf

parents e7dcf492 f7354028
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 938 additions and 640 deletions
manifest.json
View file @ 563d4e49
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"description" : "商家", "description" : "商家",
"versionName" : "1.0.98", "versionName" : "1.0.98",
"versionCode" : 198, "versionCode" : 198,
"transformPx" : false, "transformPx" : false,
"compatible" : { "compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 "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" //兼容的编译器版本号 "compilerVersion" : "2.9.8" //兼容的编译器版本号
}, },
/* 5+App特有相关weex */ /* 5+App特有相关weex */
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ 563d4e49
...@@ -390,44 +390,40 @@ ...@@ -390,44 +390,40 @@
checked:'2' checked:'2'
}], }],
ischeckedtime:[0],//默认选中， ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
value: 'cate_id',
},
name: 'product', name: 'product',
result:[], result:[],
form: { form: {
// mandatory:'2', mandatory:'2',
// linkage_id:'', linkage_id:'',
// //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名 //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
// specifications:'',//商品规格 specifications:'',//商品规格
// stock:'', //商品库存 stock:'', //商品库存
// cost_price:'', //进货价钱 cost_price:'', //进货价钱
// code:'' ,//条形编码 code:'' ,//条形编码
// commission:'', //返佣比例 commission:'', //返佣比例
// sell_type:0,// 售卖类型 sell_type:0,// 售卖类型
// commodity_data:{}, //原始商品名 commodity_data:{}, //原始商品名
// quality_guarantee_period:0, //保质期（月） quality_guarantee_period:0, //保质期（月）
// manufacture_date:'' , //生产日期 manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商 manufacturer :'', ///生产厂商
// brand :'', // 品牌 brand :'', // 品牌
// checkbox: [],//断选 checkbox: [],//断选
// product_id:"",//修改的时候的产品id product_id:"",//修改的时候的产品id
// product_name:"",//产品名称 product_name:"",//产品名称
// desc:"",//产品描述 desc:"",//产品描述
// cate_id:"",//产品分类id cate_id:"",//产品分类id
// photo:"",//产品图片 photo:"",//产品图片
// lunch_box_fee:'',//餐盒费 lunch_box_fee:'',//餐盒费
// is_new:"",//是否新产品 is_new:"",//是否新产品
// is_hot:"",//是否热卖产品 is_hot:"",//是否热卖产品
// action:"add",// 方式（添加：add，修改:edit） action:"add",// 方式（添加：add，修改:edit）
// price:"",//价格 price:"",//价格
// activity_price:"",//秒杀价 activity_price:"",//秒杀价
// store_count:"" ,// 秒杀库存 store_count:"" ,// 秒杀库存
// is_seckill:"0",//0 1 是否秒杀产品 is_seckill:"0",//0 1 是否秒杀产品
// activity_id:'0',//秒杀activity_id activity_id:'0',//秒杀activity_id
// activity_list:'',//秒杀列表 activity_list:'',//秒杀列表
// limit_num:"0" //秒杀限购数量 0 不限制 limit_num:"0" //秒杀限购数量 0 不限制
}, },
timeList:[ timeList:[
{} {}
...@@ -452,13 +448,16 @@ ...@@ -452,13 +448,16 @@
activity_type:"",//判断是否可以秒杀 activity_type:"",//判断是否可以秒杀
seckilltimelist:[],//秒杀时段列表 seckilltimelist:[],//秒杀时段列表
selchildList:[], selchildList:[],
cate_name:"",
index:0, index:0,
isScanCode:true,//是不是点击了扫码 isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入 codeDisabled:false,//条形码是否能输入
update:true, update:true,
detail_photos:[],//详情图片 detail_photos:[],//详情图片
video_photos:[],//轮播图片 video_photos:[],//轮播图片
cate_name:"", //分类名
} }
}, },
computed: { computed: {
...@@ -765,8 +764,15 @@ ...@@ -765,8 +764,15 @@
let res = await eleProductInfo({ let res = await eleProductInfo({
product_id:this.product_id, product_id:this.product_id,
}); });
console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){ 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.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name; this.bools = res.data.product_name;
this.defaultinfo = res.data; this.defaultinfo = res.data;
...@@ -777,7 +783,7 @@ ...@@ -777,7 +783,7 @@
this.form.photo = res.data.photo;//图片 this.form.photo = res.data.photo;//图片
this.form.activity_price = res.data.activity_price //秒杀价 this.form.activity_price = res.data.activity_price //秒杀价
this.form.store_count = res.data.store_count //秒杀库存 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.activity_id = res.data.activity_id//秒杀时段id
this.form.limit_num = res.data.limit_num this.form.limit_num = res.data.limit_num
this.form.specifications = res.data.gram this.form.specifications = res.data.gram
...@@ -836,7 +842,6 @@ ...@@ -836,7 +842,6 @@
}else{ }else{
this.classValue = ''; this.classValue = '';
} }
//属性选默认值 //属性选默认值
if(res.data.is_new==1){ if(res.data.is_new==1){
...@@ -875,16 +880,19 @@ ...@@ -875,16 +880,19 @@
} }
}, },
getForm() { getForm() {
if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){ // if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
this.$api.msg("请填写完整秒杀数据"); // this.$api.msg("请填写完整秒杀数据");
return false; // return false;
} // }
if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
this.$api.msg("秒杀库存或限购数量不能为小数"); // console.log(this.form.limit_num,this.form.store_count)
return false; // if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
} // this.$api.msg("秒杀库存或限购数量不能为小数");
// return false;
// }
let can = { let can = {
action:this.product_id==''?'add':'edit',
linkage_id:this.linkage_id, linkage_id:this.linkage_id,
mandatory:this.form.mandatory, mandatory:this.form.mandatory,
gram:this.form.specifications, //商品规格 gram:this.form.specifications, //商品规格
...@@ -901,7 +909,6 @@ ...@@ -901,7 +909,6 @@
product_name:this.form.product_name,//产品名称 product_name:this.form.product_name,//产品名称
desc:this.form.desc,//产品描述 desc:this.form.desc,//产品描述
lunch_box_fee:this.form.lunch_box_fee,//餐盒费 lunch_box_fee:this.form.lunch_box_fee,//餐盒费
action:this.form.action,//方式（添加：add，修改:edit）
price:this.form.price,//价格 price:this.form.price,//价格
photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片 photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价 activity_price:this.form.activity_price,//秒杀价
...@@ -911,6 +918,7 @@ ...@@ -911,6 +918,7 @@
limit_num:this.form.limit_num ,//秒杀限购数量 limit_num:this.form.limit_num ,//秒杀限购数量
detail_photos:this.detail_photos,//详情图 detail_photos:this.detail_photos,//详情图
video_photos:this.video_photos,//轮播图 video_photos:this.video_photos,//轮播图
cate_id:this.form.cate_id,
}; };
...@@ -940,11 +948,11 @@ ...@@ -940,11 +948,11 @@
can.is_hot = 0; can.is_hot = 0;
} }
if(this.product_id!="" && this.is_datashow !=false ){ if(this.product_id!="" && this.is_datashow !=false ){
can.action = "edit";
can.product_id = this.product_id; can.product_id = this.product_id;
} }
//添加修改外卖产品 //添加修改外卖产品
addEditEleProduct(can).then((res1)=>{ addEditEleProduct(can).then((res1)=>{
console.log(res1,'成功了');
if(res1.code==0){ if(res1.code==0){
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
setTimeout(()=>{ setTimeout(()=>{
...@@ -953,6 +961,8 @@ ...@@ -953,6 +961,8 @@
}else{ }else{
this.$api.msg(res1.msg); this.$api.msg(res1.msg);
} }
}).catch(err=>{
console.log(err,'失败了');
}) })
}, },
......
pages/index/index.vue
View file @ 563d4e49
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> --> <!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
<view class="jiu_min"> <view class="jiu_min">
<view> <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> <view>商品管理</view>
</view> </view>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<navigator url="/pages/storeCategory/storeCategory?type=1"> <navigator url="/pages/storeCategory/storeCategory?type=1">
<view class="jiu_min"> <view class="jiu_min">
<view> <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> <view>商品分类</view>
</view> </view>
...@@ -186,12 +186,12 @@ ...@@ -186,12 +186,12 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max" v-if="shop_type == 'goods'"> <view class="jiu_max" v-if="shop_type == 'goods'">
<!-- 商城订单 --> <!-- 商城订单 -->
<navigator url="/pages/order/shopOrder"> <navigator url="/pages/order/shopOrder">
<view class="jiu_min"> <view class="jiu_min">
<view> <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> <view>订单管理</view>
</view> </view>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<navigator url="/pages/hotelOrder/hotelOrder"> <navigator url="/pages/hotelOrder/hotelOrder">
<view class="jiu_min"> <view class="jiu_min">
<view> <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> <view>订单管理</view>
</view> </view>
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
<navigator url="/pages/LuckDraw/homenav/homenav"> <navigator url="/pages/LuckDraw/homenav/homenav">
<view class="jiu_min"> <view class="jiu_min">
<view> <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> <view>抽奖活动</view>
</view> </view>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/Printer/AddPrinter"> <navigator url="/pages/Printer/AddPrinter">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</navigator> </navigator>
</view> </view>
<view class="jiu_max " @tap="shops"> <view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/news/turntable.png" mode=""></image> <image class="img" src="/static/news/turntable.png" mode=""></image>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</view> </view>
</view> </view>
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/deliveryCost/deliveryCost"> <navigator url="/pages/deliveryCost/deliveryCost">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
</view> </view>
<!-- hgService.showSafeSetting(); --> <!-- 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"> <navigator url="/pages/eleProduct/eleProduct?edit=1">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</navigator> </navigator>
</view> </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"> <navigator url="/pages/eleProduct/eleProduct?edit=2">
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
...@@ -300,9 +300,9 @@ ...@@ -300,9 +300,9 @@
</view> </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>
<view class="jiu_min"> <view class="jiu_min">
<view> <view>
<image class="img" src="/static/icon/download.png" mode=""></image> <image class="img" src="/static/icon/download.png" mode=""></image>
</view> </view>
...@@ -313,11 +313,11 @@ ...@@ -313,11 +313,11 @@
<!-- url="/pages/publishActivities/activityList/activityList" --> <!-- url="/pages/publishActivities/activityList/activityList" -->
<view class="jiu_max "> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/publishActivities/activityList/activityList"> <navigator url="/pages/publishActivities/activityList/activityList">
<view class="jiu_min"> <view class="jiu_min">
<view> <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>
<view>0元领活动</view> <view>0元领活动</view>
</view> </view>
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
this.is_luck_draw = res.data.shop_info.is_luck_draw this.is_luck_draw = res.data.shop_info.is_luck_draw
this.money_type = res.data.shop_info.money_type this.money_type = res.data.shop_info.money_type
this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格 this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格
console.log(this.shop_type,'aa')
} else { } else {
this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
......
pages/publishActivities/activityList/activityList.vue
View file @ 563d4e49
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
</label> --> </label> -->
<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image> <image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
<view class="infobox" style="width: 70%;"> <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 class="time">上架时间：{{item.create_time}}</view> -->
<view> <view>
<view style="font-size:26rpx;font-weight:bold;">领取时间：</view> <view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
...@@ -49,7 +51,7 @@ ...@@ -49,7 +51,7 @@
</view> </view>
<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"> <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>
</view> </view>
...@@ -86,7 +88,7 @@ ...@@ -86,7 +88,7 @@
</checkbox-group> </checkbox-group>
</view> </view>
<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"> <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>
</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
...@@ -3,26 +3,15 @@ ...@@ -3,26 +3,15 @@
module.exports = { module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境 //是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:false,//正式
isdebug:false,//正式 // isdebug:true,//测试
// isdebug:true,//测试 // xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS // #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式 // isdebug:false,//正式 APP里面绝对是正式
// #endif // #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