Skip to content

L
lumastoreapp
Commit 48225b9e authored by 000's avatar 000
Browse files
Options

Merge branch 'dev' into 'feature_recommend_q' 

Dev

See merge request !4
parents c12e1f71 77ea1ba6
Show whitespace changes
Inline Side-by-side
Showing with 2308 additions and 776 deletions
App.vue
View file @ 48225b9e
......@@ -4,7 +4,6 @@
const time='';
import {newsRemind} from "@/utils/api/api.js";//获取商家消息
export default {
onLaunch: function() {
if(platform=='ios'){
......@@ -18,13 +17,12 @@
});
}
// #ifdef APP-PLUS
//app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
setTimeout(()=>{
plus.navigator.closeSplashscreen();
},100);
uni.getNetworkType({ //查看是否有网络
success: function (res) {
if(res.networkType=='none'){
......@@ -66,37 +64,78 @@
var rsult=hgService.checkIfLimited(); //检测是否限制后台运行
if(rsult.isLimit){ //限制了后台运行
hgService.requestIgnoreLimit(); //申请允许后台运行
hgService.requestIgnoreLimit(); //申请
}else{ //没有限制后台运行
console.log('没有限制');
hgService.startService(); //启动前台服务
//hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
}
//var globalEvent = uni.requireNativePlugin('globalEvent'); //全局事件回调 任务启动时间，会有一定延时 一般一分钟内。
// console.log('没有限制');
hgService.startService(); //启动前台服务
// hgService.showSafeSetting();//打开安全管理 支持小米，华为，锤子，opp,vivo,三星，乐视，魅族
//var globalEvent = uni.requireNativePlugin('globalEvent'); //全局事件回调 任务启动时间，会有一定延时 一般一分钟内。
},
// hgServiceFun(){
// const pushLive = uni.requireNativePlugin('push-live');
// pushLive.startService({ //启动服务
// title: "鹿马商家助手",
// content: "小鹿正在为您进行实时播报...",
// mode: 1 //0省电模式 1流氓模式
// }, function(res) {
// console.log(res)
// });
// pushLive.isIgnoringBatteryOptimizations(function(res) { //是否添加到白名单中
// if(res.flag){ //添加进去了
// //pushLive.gotoWhiteListSetting();
// }else{
// pushLive.requestIgnoreBatteryOptimizations(); //申请加入白名单
// }
// })
// var globalEvent = uni.requireNativePlugin('globalEvent');
// globalEvent.addEventListener('doJobEvent', function() {
// console.log("我被定时启动了。。。。。。。。。。。。。。。。。")
// });
// console.log(globalEvent)
// },
//获取 语音消息
async getnewsRemind(type){
var date = new Date();
let hours = date.getHours();//当前 时间 小时
let datestime = 5000;//默认15秒
if(this.$store.state.token!=""){//判断是否 已登录
//#ifdef APP-PLUS
let cid = plus.push.getClientInfo().clientid
//#endif
console.log('这里')
let res = await newsRemind({
uid:this.$store.state.userInfo.user_id,
cid:plus.push.getClientInfo().clientid
cid:cid
});
if(res.code==0){
console.log('有语音','--------',res);
if(res.data.length!=0){
let KJres = res.data.filter(item =>{ //快捷支付
return item.type==3
return item.type==3 || item.type==0
})
let PSres = res.data.filter(item => { //订单
return item.type==4 || item.type==5 || item.type==6
return item.type==4 || item.type==5 || item.type==6 || item.type==1
})
if(platform=='ios'){
......@@ -140,17 +179,21 @@
}else{
if(PSres.length!=0){
let msgtext = `你有${PSres.length}条鹿马订单,请及时处理`;
console.log('商城语音播报')
if(this.$store.state.isvoice){
this.$store.dispatch('AudioVoice',msgtext).then((e) => {
uni.vibrateLong();//震动 调用//400ms//长震动
})
}
}
if(KJres.length!=0){
let payText =""
KJres.map(item=>{
payText = payText+","+ item.contents
});
console.log('快捷支付播报')
if(this.$store.state.isvoice){
this.$store.dispatch('AudioVoice',payText).then((e) => {
uni.vibrateLong();//震动 调用//400ms//长震动
......@@ -161,7 +204,6 @@
}
}
if(type!=2){
return true;
}
......
components/moduPopup/moduPopup.vue
View file @ 48225b9e
......@@ -102,7 +102,9 @@
//提示弹窗
change(e) {
console.log('是否打开:' + e.show)
console.log(this.$store.state.Timer,'退出登陆取消')
if (!e.show) {
console.log(this.$store.state.Timer,'退出登陆')
this.showtip = false
}
},
......@@ -111,6 +113,7 @@
this.$emit("cancel",{});//触发回调方法
},
show(){
this.showtip = true;
},
//确认发布点击
......
components/orderItemss/orderItemss.vue
View file @ 48225b9e
......@@ -17,6 +17,9 @@
<view class="time">{{dataorder.create_time}}</view>
</view>
</view>
<view class="beizhu flex jus-b ali-c" style="border-bottom: 1px solid #f1f1f1;">
<text class="price">{{dataorder.username_tel}}</text>
</view>
<!-- 上面的是 -->
<!-- reorder -->
<view class="mingxi oneline" v-for="(item,index) in dataorder.products" :key="index">{{item.productname}} x {{item.num}}</view>
......@@ -24,6 +27,7 @@
<text class="beizhutext oneline flex1" v-if="dataorder.remark">备注：{{dataorder.remark||''}}</text>
<text class="beizhutext oneline flex1" v-if="dataorder.message">退款原因：{{dataorder.message||''}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
</view>
<view class="orderItemss_foot jus-b">
<view class="titmeboxs ali-c" >
......
components/plan-image-upload/up_img.vue
View file @ 48225b9e
......@@ -9,7 +9,7 @@
<view v-if="isShowAdd" class="imageUpload" @tap="selectImage">+</view>
</view>
<image v-if="showMoveImage" class="moveImage" :style="{left:posMoveImageLeft, top:posMoveImageTop}" :src="moveImagePath"></image>
<view class="showname">请添加奖品图片</view>
<view class="showname" style="margin-left: 20upx;">请添加图片</view>
</view>
</template>
......@@ -41,7 +41,6 @@
},
watch:{
value(){
console.log(this.value,'帆帆帆帆')
}
},
computed:{
......@@ -135,14 +134,9 @@
},
name: keyname,
success: function(res){
console.log(JSON.parse(res.data),'成功了啊啊')
if(res.statusCode === 200){
_self.value.push(JSON.parse(res.data))
completeImages ++
if(_self.showUploadProgress){
uni.showToast({
title: '上传进度：' + completeImages + '/' + imagePathArr.length,
......@@ -151,7 +145,7 @@
duration: 1000
});
}
console.log('success to upload image: ' + res.data)
//console.log('success to upload image: ' + res.data)
resolve('success to upload image:' + remoteUrlIndex)
}else{
console.log('fail to upload image:'+res.data)
......@@ -365,8 +359,8 @@
}
.imageItem, .imageUpload{
width: 200upx;
height: 200upx;
width: 190upx;
height: 190upx;
margin: 0 20upx 30upx 0;
}
.imageItem:nth-child(3n){
......
manifest.json
View file @ 48225b9e
......@@ -3,9 +3,14 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.90",
"versionCode" : 190,
"versionName" : "1.0.96",
"versionCode" : 196,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
"runtimeVersion" : "2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
"compilerVersion" : "2.9.8" //兼容的编译器版本号
},
/* 5+App特有相关weex */
"app-plus" : {
"usingComponents" : true,
......@@ -50,7 +55,12 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\"/>",
"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
"<uses-permission android:name=\"android.permission.REORDER_TASKS\"/>",
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
"<uses-permission android:name=\"android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS\"/>"
]
},
/* ios打包配置 */
......@@ -116,9 +126,9 @@
},
"splashscreen" : {
"android" : {
"hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
"hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
},
"ios" : {
"iphone" : {
......@@ -154,22 +164,7 @@
}
},
"compilerVersion" : 2,
"nativePlugins" : {
"HG-Background" : {
"__plugin_info__" : {
"name" : "保活 前台运行",
"description" : "用于提高app存活概率或添加前台显示 q群：219508489",
"platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=2203",
"android_package_name" : "com.app.lumastore",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 1,
"pid" : "2203",
"parameters" : {}
}
}
}
"nativePlugins" : {}
},
/* 快应用特有相关 */
"quickapp" : {},
......
pages.json
View file @ 48225b9e
......@@ -236,6 +236,18 @@
"navigationBarTitleText":"添加外卖产品"
}
},
{
"path" : "pages/addEditEleProduct/editProductStore",
"style" : {
"navigationBarTitleText":"快捷修改库存"
}
},
{
"path" : "pages/addEditEleProduct/editProductPrice",
"style" : {
"navigationBarTitleText":"快捷修改价格"
}
},
{
"path" : "pages/ViewLogistics/ViewLogistics",
"style" : {
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ 48225b9e
......@@ -74,6 +74,23 @@
</view>
</view> -->
<view class="noecellbox">
<view class="title">必选品或非必选</view>
<view class="inputbox flex">
<radio-group @change="mandatoryradioChange">
<view class="chindlost ali-c flex flex-wrap" >
<view class="" v-for="(item, index) in mandatoryType" :key="item.value">
<label class="lableitem flex ali-c" style="margin-right: 40upx;">
<view >
<radio color="#FF6900" :value="item.value" :checked="item.value == form.mandatory" />
</view>
<view class="titles">{{item.name}}</view>
</label>
</view>
</view>
</radio-group>
</view>
</view>
<view class="noecellbox" v-if="isadd==1">
<view class="title">商品库存(库存剩余{{form.stock}})</view>
......@@ -210,20 +227,46 @@
</view>
<view class="addmigs">
<view class="titlehe">缩略图<text style="color: red;">(必传)</text></view>
<view class="titlehe">产品缩略图<text style="color: red;">(必传)</text></view>
<robby-image-upload
fileKeyName="img"
:value="c_pics"
:server-url="uploadurl1+'/merchant.php/FileUpload/uploadify'"
:form-data="c_formData"
:server-url-delete-image="uploadurl1"
@add="c_onImg"
@delete="c_delImage"
@add="c_onImg1"
@move="onMove_c"
:limit="1"
>
</robby-image-upload>
</view>
<view class="addmigs">
<view class="titlehe">产品轮播图<text style="color: red;">(必传)</text></view>
<robby-image-upload
fileKeyName="img"
:value="c_pics1"
:server-url="uploadurl1+'/merchant.php/FileUpload/uploadify'"
:form-data="c_formData"
@add="c_onImg1"
@delete="c_delImage1"
:limit="4"
>
</robby-image-upload>
</view>
<view class="addmigs">
<view class="titlehe">产品详情图</view>
<robby-image-upload
fileKeyName="img"
:value="c_pics2"
:server-url="uploadurl1+'/merchant.php/FileUpload/uploadify'"
:form-data="c_formData"
@add="c_onImg2"
@delete="c_delImage2"
:limit="9"
>
</robby-image-upload>
</view>
<!-- 多选列表 勾选的位置 -->
<view class="checkboxs">
<view class="title">属性:</view>
......@@ -327,6 +370,17 @@
name: '计重（kg）',
checked:'2'
}],
mandatoryType: [{
value: '1',
name: '必选品',
checked:'1'
}, {
value: '2',
name: '非必选',
checked:'2'
}],
storeNumber: [{
value: '1',
name: '增加库存',
......@@ -336,7 +390,6 @@
name: '减少库存',
checked:'2'
}],
// issancodeType:1,
ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
......@@ -345,37 +398,37 @@
name: 'product',
result:[],
form: {
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:[
{}
......@@ -384,8 +437,9 @@
chindformList:[],
//上传图片相关的
c_pics: [],
c_photos: [],
c_formData: {
c_pics1:[],
c_pics2:[],
c_formData: { //请求接口得参数
model:"shopphoto",
},
product_id:"",//修改产品时候用的修改id
......@@ -403,7 +457,9 @@
index:0,
isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入
update:true
update:true,
detail_photos:[],//详情图片
video_photos:[],//轮播图片
}
},
computed: {
......@@ -413,12 +469,6 @@
staticUrl(){
return this.$store.state.staticUrl;
},
// startDate() {
// return '2020-11-20';
// },
// endDate() {
// return this.getDate('');
// }
},
onLoad(opdata) {
getskipShop({
......@@ -426,12 +476,9 @@
}).then(res=>{
if(res.code == 0){
this.is_bld = res.data.is_bld
// this.is_bld=1
}
})
getshopclass({}).then(res=>{
if(res.code == 0){
console.log(res.data)
this.ordinary = res.data.ordinary
......@@ -440,15 +487,12 @@
if(this.ordinary.length!=[]){
for(let i=0;i<res.data.ordinary.length;i++){
this.classData[1][i] = res.data.ordinary[i].product_name
}
}
console.log(this.classData[1])
}
})
this.isadd = opdata.isadd
// console.log(this.isadd,'aaa')
this.c_formData.user_token = this.$store.state.token;
this.activity_type = opdata.activity_type,
this.isShow = this.activity_type==1?true:false
......@@ -465,32 +509,19 @@
this.typeManagerfun();
this.getActivityListfun(); //获取数据列表
// console.log(JSON.parse(opdata.results).data.code,111111111111111111111111111111111)
// let results=JSON.parse(opdata.results);
if(opdata.results){
if(JSON.parse(opdata.results).data.code==1){
let results=JSON.parse(opdata.results);//扫描得到得商品信息
this.findEleProduct(results);
// this.findEleProduct(opdata.results);
}else{
let results = JSON.parse(opdata.results);
this.form.code = results.code
this.findEleProduct(results)
}
}
// this.issancodeType = opdata.results.issancodeType
// this.isType = opdata.results.isType
// console.log(this.isType)
},
methods: {
columnbindData(e){
// console.log(e,'啊啊啊啊啊')
this.classDataValue[e.detail.column]=e.detail.value;
if(e.detail.column == 0){
......@@ -586,8 +617,6 @@
let res=await findEleProduct({code:results.code});
console.log(res,11111111111111111111111)
uni.hideLoading();
if(res.code==-1){ //没有就录入
this.isadd=0;
......@@ -596,7 +625,6 @@
this.form.code=results.code;//条形码
this.form.original_name = results.data.data.goodsName;
this.form.product_name = results.data.data.goodsName;
// this.c_pics = [{code:0,data:results.data.data.img,msg:"success",time:"1587101904"}];
this.form.commodity_data = results.data.data;
this.form.price=results.data.data.price;
this.isScanCode=results.isScanCode;
......@@ -635,6 +663,7 @@
this.isScanCode=false;
this.codeDisabled=true;//条形码输入框是否禁止输入
this.c_pics=[{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
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;
......@@ -680,6 +709,10 @@
this.form.sell_type = e.detail.value
console.log(this.form.sell_type)
},
mandatoryradioChange(e){
this.form.mandatory = e.detail.value
console.log(this.form.mandatory)
},
radioChanges(e){
......@@ -733,7 +766,7 @@
let res = await eleProductInfo({
product_id:this.product_id,
});
// console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){
this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name;
......@@ -748,12 +781,7 @@
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.classValue = res.data.product_name
this.form.specifications = res.data.gram
// quality_guarantee_period:this.qualitYears*365+this.qualityMonths*30+this.qualityDays, //保质期（月）
// manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商
// brand :'', // 品牌
this.form.quality_guarantee_period = res.data.quality_guarantee_period
this.qualitYears = parseInt(res.data.quality_guarantee_period/365)
this.qualityMonths = parseInt((res.data.quality_guarantee_period%365)/30)
......@@ -761,20 +789,30 @@
this.form.manufacture_date = res.data.manufacture_date
this.form.manufacturer = res.data.manufacturer
this.form.brand = res.data.brand
// 2020-10-22 添加字段
this.form.stock = res.data.stock, //商品库存
this.form.cost_price = res.data.cost_price/100, //进货价钱
this.form.code = res.data.code , //条形编码
this.form.commission = res.data.commission, //返佣比例
this.form.sell_type = res.data.sell_type, // 售卖类型
// this.form.commodity_data:{}, //原始商品名
// 2020-10-22 添加字段
// this.commodity_type = ordinary
this.form.mandatory = res.data.mandatory
this.video_photos=res.data.video_photos;//轮播
this.detail_photos=res.data.detail_photos;//详情
res.data.video_photos.map(item=>{ //轮播
this.c_pics1.push({
code:0,
data:item,
msg:"success",
time:"1587101904"
})
})
res.data.detail_photos.map(item=>{ //详情
this.c_pics2.push({
code:0,
data:item,
msg:"success",
time:"1587101904"
})
})
//下拉分类 初始值
this.chindformList.forEach((item,index)=>{
if(item.cate_id==res.data.cate_id){
......@@ -783,8 +821,6 @@
}
});
// this.classValue = res.data.product_name
if(res.data.commodity_type == 'ordinary') {
this.ordinary.map(item=>{
if(this.linkage_product_id == item.product_id){
......@@ -792,21 +828,16 @@
}
})
}else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name
console.log(this.classValue,item.product_name)
}
console.log(this.classValue)
})
}else{
this.classValue = '';
}
console.log(this.classValue)
//属性选默认值
if(res.data.is_new==1){
......@@ -839,7 +870,6 @@
//处理上传的图片默认值
this.c_pics = [{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
this.form.photo = res.data.photo;
this.c_photos = ["res.data.photo"]
}else{
this.$api.msg(res.msg);
......@@ -855,17 +885,9 @@
return false;
}
// quality_guarantee_period = this.qualitYears*365 + this.qualityMonths*30 + this.qualityDays
// console.log(this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1)
// if(this.c_pics.length == 0){
// this.$api.msg('产品图片未上传');
// }
let can = {
linkage_id:this.linkage_id,
mandatory:this.form.mandatory,
gram:this.form.specifications, //商品规格
quality_guarantee_period : this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1, //保质期（月）
manufacture_date :this.form.manufacture_date, //生产日期
......@@ -882,13 +904,15 @@
lunch_box_fee:this.form.lunch_box_fee,//餐盒费
action:this.form.action,//方式（添加：add，修改:edit）
price:this.form.price,//价格
cate_id:this.form.cate_id,
photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价
store_count:this.form.store_count ,//秒杀库存
activity_id:this.form.activity_id,//秒杀时间id
activity_list:this.form.activity_list,
limit_num:this.form.limit_num ,//秒杀限购数量
detail_photos:this.detail_photos,//详情图
video_photos:this.video_photos,//轮播图
};
if(this.c_pics.length > 0){
......@@ -906,15 +930,6 @@
}
})
// if(this.stockType==1){
// console.log(this.stockType,1111111111)
// can.stock = this.stock_number
// }else{
// can.stock = '-'+this.stock_number
// console.log(this.stockType,1111111111)
// }
if(this.selchildList.includes("is_new")){
can.is_new = 1;
}else{
......@@ -930,11 +945,7 @@
can.product_id = this.product_id;
}
//添加修改外卖产品
console.log('这里了9999999999999999999')
console.log(can)
addEditEleProduct(can).then((res1)=>{
console.log(res1)
if(res1.code==0){
this.$api.msg(res1.msg);
setTimeout(()=>{
......@@ -975,33 +986,42 @@
isInteger(obj){
return obj%1 === 0;
},
//图片上传
c_delImage(e) {
// console.log(e,'反对发射点')
let arr = []
for (let k in e.allImages) {
arr[k] = e.allImages[k].id
}
this.c_photos = arr
c_onImg(e) { //上传缩略图
this.isScanCode=true;
this.c_pics= e.allImages
},
c_onImg1(e) {
c_onImg1(e) { //上传轮播图
this.isScanCode=true;
this.c_pics = e.allImages
const obj = e.allImages
for (let index in obj) {
let id = obj[index].data
this.c_photos[index] = id
}
this.c_pics1 = e.allImages;
e.allImages.map((item,index)=>{
this.video_photos[index] = item.data
})
},
c_onImg2(e) { //上传详情图
this.isScanCode=true;
this.c_pics2 = e.allImages;
e.allImages.map((item,index)=>{
this.detail_photos[index] = item.data
})
},
c_delImage(e) { //删除产品缩略图图片
this.c_pics=[];
},
c_delImage1(e) { //删除轮播某个图片
let arr=[];
e.allImages.map(item=>{
arr.push(item.data);
});
this.video_photos=arr;
},
c_delImage2(e) { //删除产品详情某个图片
let arr=[];
e.allImages.map(item=>{
arr.push(item.data);
})
this.detail_photos=arr;
},
onMove_c(e) {
this.c_pics = e;
// console.log(e,'反对法地方')
const obj = e
for (let index in obj) {
let id = obj[index].data
this.c_photos[index] = id
}
}
},
}
</script>
......
pages/addEditEleProduct/editProductPrice.vue 0 → 100644
View file @ 48225b9e
<template>
<!-- 添加外卖商品 -->
<view class="productpages">
<view class="noecellbox">
<view class="title" >产品名称</view>
<view class="inputbox flex">
<input class="input flex1" type="text" v-model="form.product_name" value="" placeholder-class="plclass" placeholder="请填写产品名称" />
</view>
</view>
<view class="noecellbox">
<view class="title" >产品价格<text style="color: red;">(必填)</text></view>
<view class="inputbox flex">
<input class="input flex1" type="number" v-model="form.price" value="" placeholder-class="plclass" placeholder="请填写产品价格" />
</view>
</view>
<view class="noecellbox" v-if="form.code !='' && form.code !=0">
<view class="title" >条形编码</view>
<view class="inputbox flex">
<input class="input flex1" disabled="disabled" type="number" v-model="form.code" value="" placeholder-class="plclass" placeholder="请填写产品价格" />
</view>
</view>
<view class="submitbtn active" @tap="getForm">提交</view>
</view>
</template>
<script>
import QSApp from '@/components/QS-inputs-split/js/app.js';
import {addEditEleProduct,typeManager,eleProductInfo,findEleProduct} from "@/utils/api/api.js";
import{getskipShop,getshopclass} from "@/utils/api/merchant.js";
import robbyImageUpload from '@/components/plan-image-upload/up_img';//上传资质图片组件
import {getActivityList} from '@/utils/api/merchant.js';
export default {
components:{
robbyImageUpload
},
data() {
return {
linkage_id:'',
is_datashow:true,
bools:'',
linkage_product_id:'',
classValue:'',
ordinary :[],
weigh :[],
classData:[
['普通商品','称重商品'],
[]
],
classDataValue:[0,0],
is_bld:'',
isadd:0, //0 填写商品库存 1修改库存
stock_number:'',
stockType:1,
qualitYears:"",
qualityMonths:"",
qualityDays:"",
sellType: [{
value: '1',
name: '计件（件）',
checked:'1'
}, {
value: '2',
name: '计重（kg）',
checked:'2'
}],
storeNumber: [{
value: '1',
name: '增加库存',
checked:'1'
}, {
value: '2',
name: '减少库存',
checked:'2'
}],
// issancodeType:1,
ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
value: 'cate_id',
},
name: 'product',
result:[],
form: {
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:[
{}
],
isShow:false,
chindformList:[],
//上传图片相关的
c_pics: [],
c_photos: [],
c_formData: {
model:"shopphoto",
},
product_id:"",//修改产品时候用的修改id
defaultinfo:{},//修改的时候的默认初始数据
listchind:[
{name:"是否新产品",value:"is_new",checked:false},
{name:"是否热卖产品",value:"is_hot",checked:false},
],
isshowsetkilltime:false,//是否显示秒杀时间
listissetkill:[{name:"是否秒杀产品",value:"is_seckill",checked:false}],
activity_type:"",//判断是否可以秒杀
seckilltimelist:[],//秒杀时段列表
selchildList:[],
cate_name:"",
index:0,
isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入
update:true
}
},
computed: {
uploadurl1(){
return this.$store.state.uploadurl1;
},
staticUrl(){
return this.$store.state.staticUrl;
},
},
onLoad(opdata) {
this.product_id = opdata.id
this.eleProductInfofun()
},
methods: {
//修改的时候赋初始值
async eleProductInfofun(){
let res = await eleProductInfo({
product_id:this.product_id,
});
// console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){
this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name;
this.defaultinfo = res.data;
this.form.product_name = res.data.product_name;//名称
this.form.desc = res.data.desc;//描述
this.form.lunch_box_fee = res.data.lunch_box_fee/100;//餐盒费
this.form.price = res.data.price;//价格
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.classValue = res.data.product_name
this.form.specifications = res.data.gram
// quality_guarantee_period:this.qualitYears*365+this.qualityMonths*30+this.qualityDays, //保质期（月）
// manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商
// brand :'', // 品牌
this.form.quality_guarantee_period = res.data.quality_guarantee_period
this.qualitYears = parseInt(res.data.quality_guarantee_period/365)
this.qualityMonths = parseInt((res.data.quality_guarantee_period%365)/30)
this.qualityDays = parseInt((res.data.quality_guarantee_period%365)%30)
this.form.manufacture_date = res.data.manufacture_date
this.form.manufacturer = res.data.manufacturer
this.form.brand = res.data.brand
// 2020-10-22 添加字段
this.form.stock = res.data.stock, //商品库存
this.form.cost_price = res.data.cost_price/100, //进货价钱
this.form.code = res.data.code , //条形编码
this.form.commission = res.data.commission, //返佣比例
this.form.sell_type = res.data.sell_type, // 售卖类型
// this.form.commodity_data:{}, //原始商品名
// 2020-10-22 添加字段
// this.commodity_type = ordinary
//下拉分类 初始值
this.chindformList.forEach((item,index)=>{
if(item.cate_id==res.data.cate_id){
this.index =index;
this.cate_name = item.cate_name;
}
});
// this.classValue = res.data.product_name
if(res.data.commodity_type == 'ordinary') {
this.ordinary.map(item=>{
if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name
}
})
}else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name
console.log(this.classValue,item.product_name)
}
console.log(this.classValue)
})
}else{
this.classValue = '';
}
console.log(this.classValue)
//属性选默认值
if(res.data.is_new==1){
this.selchildList.push("is_new");
this.listchind[0].checked = true;
}else{
this.listchind[0].checked = false;
}
if(res.data.is_hot==1){
this.selchildList.push("is_hot");
this.listchind[1].checked = true;
}else{
this.listchind[1].checked = false;
}
if(res.data.activity_list == '49,'){
this.listissetkill[0].checked = true
this.isshowsetkilltime = true
this.form.activity_list = res.data.activity_list
let indexlist = this.seckilltimelist.filter((item,index)=>{
if(item.activity_id==this.form.activity_id){
return item
}
})
let temparr = indexlist[0]
let index = this.seckilltimelist.indexOf(temparr)
this.ischeckedtime[0] = index
}
//处理上传的图片默认值
this.c_pics = [{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
this.form.photo = res.data.photo;
this.c_photos = ["res.data.photo"]
}else{
this.$api.msg(res.msg);
}
},
getForm() {
let can = {
linkage_id:this.linkage_id,
gram:this.form.specifications, //商品规格
quality_guarantee_period : this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1, //保质期（月）
manufacture_date :this.form.manufacture_date, //生产日期
manufacturer: this.form.manufacturer, ///生产厂商
brand : this.form.brand, // 品牌
// stock:this.form.stock, //商品库存
cost_price:this.form.cost_price, //进货价钱
code:this.form.code,//条形编码
sell_type:this.form.sell_type,
commission:this.form.commission, //返佣比例
commodity_data:this.form.commodity_data, //产品数据
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,//价格
cate_id:this.form.cate_id,
photo:this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价
store_count:this.form.store_count ,//秒杀库存
activity_id:this.form.activity_id,//秒杀时间id
activity_list:this.form.activity_list,
limit_num:this.form.limit_num ,//秒杀限购数量
};
this.storeNumber.map((item,index)=>{
if(item.checked==1){
if(index==0){
can.stock = this.stock_number
}else{
can.stock = '-'+ this.stock_number
}
}
})
if(this.selchildList.includes("is_new")){
can.is_new = 1;
}else{
can.is_new = 0;
}
if(this.selchildList.includes("is_hot")){
can.is_hot = 1;
}else{
can.is_hot = 0;
}
if(this.product_id!="" && this.is_datashow !=false ){
can.action = "edit";
can.product_id = this.product_id;
}
//添加修改外卖产品
console.log('这里了')
addEditEleProduct(can).then((res1)=>{
console.log(res1)
if(res1.code==0){
this.$api.msg(res1.msg);
setTimeout(()=>{
uni.navigateBack({});
},1000)
}else{
this.$api.msg(res1.msg);
}
})
},
// 判断是否为整数
isInteger(obj){
return obj%1 === 0;
},
},
}
</script>
<style lang="scss">
@import "../edit/product/addProjuct.scss";
page{
background: #fff;
}
.productpages{
background: #FFFFFF;
}
.submitbtn{
margin: 60upx 24upx;
height:88upx;
line-height: 88upx;
text-align: center;
background:rgba(254,197,156,1);
border-radius:6upx;
font-size:32upx;
color:rgba(255,255,255,1);
}
.submitbtn.active{
background: #FF6900;
}
.briefIntroduction,.Specificationsbox,.addmigs,.checkboxs{
border-bottom:1px solid #F5F2F2;
border-radius: 0 !important;
}
.img{
width: 100upx;height: 100upx;
}
.input1::-ms-input-placeholder {
text-align: center;
}
.input1::-webkit-input-placeholder {
text-align: center;
}
</style>
\ No newline at end of file
pages/addEditEleProduct/editProductStore.vue 0 → 100644
View file @ 48225b9e
<template>
<!-- 添加外卖商品 -->
<view class="productpages">
<view class="noecellbox">
<view class="title" >产品名称</view>
<view class="inputbox flex">
<input class="input flex1" type="text" v-model="form.product_name" value="" placeholder-class="plclass" placeholder="请填写产品名称" />
</view>
</view>
<view class="noecellbox" >
<view class="title">商品库存(库存剩余{{form.code.length == 13 || form.code.length == 0?form.stock:form.stock/1000}}{{form.code.length == 13 || form.code.length == 0?'件':'kg'}})</view>
<view class="inputbox flex">
<radio-group @change="radioChanges">
<view class="chindlost ali-c flex flex-wrap" >
<view class="" style="margin-right: 20rpx;" v-for="(item, index) in storeNumber" :key="item.value">
<label class="lableitem flex ali-c" >
<view>
<radio color="#FF6900" :value="item.value" :checked="item.checked == 1" />
</view>
<view class="titles">{{item.name}}</view>
</label>
</view>
</view>
</radio-group>
数量：<input class="input flex1" v-if="" @input="bingInput" type="number" v-model="stock_number" value="" placeholder-class="plclass" placeholder="增加库存数量" />
</view>
</view>
<!-- <view class="noecellbox" >
<view class="title">商品库存</view>
<view class="inputbox flex">
<input class="input flex1" v-if="" type="number" v-model="stock_number" value="" placeholder-class="plclass" placeholder="增加库存数量" />
</view>
</view> -->
<view class="noecellbox" v-if="form.code !='' && form.code !=0">
<view class="title" >条形编码</view>
<view class="inputbox flex">
<input class="input flex1" disabled="disabled" type="number" v-model="form.code" value="" placeholder-class="plclass" placeholder="请填写产品价格" />
</view>
</view>
<view class="" :hidden="linkage_product_id != 0 " v-if="is_datashow">
</view>
<view class="submitbtn active" @tap="getForm">提交</view>
</view>
</template>
<script>
import QSApp from '@/components/QS-inputs-split/js/app.js';
import {addEditEleProduct,typeManager,eleProductInfo,findEleProduct} from "@/utils/api/api.js";
import{getskipShop,getshopclass} from "@/utils/api/merchant.js";
import robbyImageUpload from '@/components/plan-image-upload/up_img';//上传资质图片组件
import {getActivityList} from '@/utils/api/merchant.js';
export default {
components:{
robbyImageUpload
},
data() {
return {
linkage_id:'',
is_datashow:true,
bools:'',
linkage_product_id:'',
classValue:'',
ordinary :[],
weigh :[],
classData:[
['普通商品','称重商品'],
[]
],
classDataValue:[0,0],
is_bld:'',
isadd:0, //0 填写商品库存 1修改库存
stock_number:'',
stockType:1,
qualitYears:"",
qualityMonths:"",
qualityDays:"",
sellType: [{
value: '1',
name: '计件（件）',
checked:'1'
}, {
value: '2',
name: '计重（kg）',
checked:'2'
}],
storeNumber: [{
value: '1',
name: '增加库存',
checked:'1'
}, {
value: '2',
name: '减少库存',
checked:'2'
}],
// issancodeType:1,
ischeckedtime:[0],//默认选中，
myProps: {
label: 'cate_name',
value: 'cate_id',
},
name: 'product',
result:[],
form: {
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:[
{}
],
isShow:false,
chindformList:[],
//上传图片相关的
c_pics: [],
c_photos: [],
c_formData: {
model:"shopphoto",
},
product_id:"",//修改产品时候用的修改id
defaultinfo:{},//修改的时候的默认初始数据
listchind:[
{name:"是否新产品",value:"is_new",checked:false},
{name:"是否热卖产品",value:"is_hot",checked:false},
],
isshowsetkilltime:false,//是否显示秒杀时间
listissetkill:[{name:"是否秒杀产品",value:"is_seckill",checked:false}],
activity_type:"",//判断是否可以秒杀
seckilltimelist:[],//秒杀时段列表
selchildList:[],
cate_name:"",
index:0,
isScanCode:true,//是不是点击了扫码
codeDisabled:false,//条形码是否能输入
update:true
}
},
computed: {
uploadurl1(){
return this.$store.state.uploadurl1;
},
staticUrl(){
return this.$store.state.staticUrl;
},
// startDate() {
// return '2020-11-20';
// },
// endDate() {
// return this.getDate('');
// }
},
onLoad(opdata) {
this.product_id = opdata.id
getskipShop({
type:'bld'
}).then(res=>{
if(res.code == 0){
this.is_bld = res.data.is_bld
// this.is_bld=1
}
})
getshopclass({}).then(res=>{
if(res.code == 0){
// console.log(res.data)
this.ordinary = res.data.ordinary
this.weigh = res.data.weigh
this.classData[1] = Array.from(res.data.ordinary)
if(this.ordinary.length!=[]){
for(let i=0;i<res.data.ordinary.length;i++){
this.classData[1][i] = res.data.ordinary[i].product_name
}
}
// console.log(this.classData[1])
}
})
this.isadd = opdata.isadd
// console.log(this.isadd,'aaa')
this.c_formData.user_token = this.$store.state.token;
this.activity_type = opdata.activity_type,
this.isShow = this.activity_type==1?true:false
this.typeManagerfun();
this.getActivityListfun(); //获取数据列表
// console.log(JSON.parse(opdata.results).data.code,111111111111111111111111111111111)
// let results=JSON.parse(opdata.results);
// this.issancodeType = opdata.results.issancodeType
// this.isType = opdata.results.isType
// console.log(this.isType)
},
methods: {
columnbindData(e){
// console.log(e,'啊啊啊啊啊')
this.classDataValue[e.detail.column]=e.detail.value;
if(e.detail.column == 0){
if(e.detail.value == 0){
console.log('我滑动到普通商品')
this.$set(this.classData,1,[]);
if(this.ordinary.length!=0){
this.ordinary.map(item=>{
this.classData[1].push(item.product_name);
})
}
console.log(this.classData[1])
}else {
console.log('我滑动到称重商品')
// this.classData[1] = [];
this.$set(this.classData,1,[]);
if(this.weigh.length!=0){
this.weigh.map(item=>{
this.classData[1].push(item.product_name);
})
}
}
}
},
bindData(e){
let that = this
console.log(e)
if(e.detail.value[0] == 0){
console.log(that.ordinary.length,'左边')
if(that.ordinary.length != 0){
that.linkage_id = that.ordinary[e.detail.value[1]].product_id
that.product_id = that.ordinary[e.detail.value[1]].product_id
that.classValue = that.ordinary[e.detail.value[1]].product_name
}else{AZ
uni.showToast({
title:'没有选中商品',
icon:'none'
})
return false;
}
}else{
console.log(that.weigh.length,'右边')
if(that.weigh.length != 0){
that.linkage_id = that.weigh[e.detail.value[1]].product_id
that.product_id = that.weigh[e.detail.value[1]].product_id
that.classValue = that.weigh[e.detail.value[1]].product_name
}else{
uni.showToast({
title:'没有选中商品',
icon:'none'
})
return false;
}
}
that.eleProductInfofun();
this.is_datashow = false;
console.log(this.is_datashow)
},
bingInput(e){
let stock_number=e.detail.value;
this.stock_number=stock_number;
let stock=Number(this.form.stock);//库存
let checked=this.storeNumber[1].checked;
if(checked==1){
if(stock-stock_number < 0 ){
//this.$set(this,'stock_number',0);
this.stock_number=0;
this.$api.msg('库存不足')
}
}
},
bindDateChange: function(e) {
this.form.manufacture_date = e.target.value
},
onCodeFocus(){ //条形码输入框聚焦事件
if(this.codeDisabled){
this.$api.msg('不能修改条形编码');
}
},
async findEleProduct(results){
uni.showLoading({title:'请稍后'});
let res=await findEleProduct({code:results.code});
uni.hideLoading();
if(res.code==-1){ //没有就录入
this.isadd=0;
this.form.manufacturer = results.data.data.supplier
this.form.brand = results.data.data.brand
this.form.code=results.code;//条形码
this.form.original_name = results.data.data.goodsName;
this.form.product_name = results.data.data.goodsName;
// this.c_pics = [{code:0,data:results.data.data.img,msg:"success",time:"1587101904"}];
this.form.commodity_data = results.data.data;
this.form.price=results.data.data.price;
this.isScanCode=results.isScanCode;
this.codeDisabled=false;//条形码输入框是否禁止输入
}else if(res.code==0){ //有就把信息展示
this.isadd=1;
this.form.quality_guarantee_period = res.data.quality_guarantee_period
this.qualitYears = parseInt(res.data.quality_guarantee_period/365)
this.qualityMonths = parseInt((res.data.quality_guarantee_period%365)/30)
this.qualityDays = parseInt((res.data.quality_guarantee_period%365)%30)
this.form.manufacture_date = res.data.manufacture_date
this.form.manufacturer = res.data.manufacturer
this.form.brand = res.data.brand
this.form.sell_type = res.data.sell_type,
this.form.stock=res.data.stock, //商品库存
this.form.cost_price=res.data.cost_price, //进货价钱
this.form.code=res.data.code ,//条形编码
this.form.commission=res.data.commission, //返佣比例
this.form.commodity_data=res.data.commodity_data, //原始商品名
this.form.product_id=res.data.product_id,//修改的时候的产品id
this.form.product_name=res.data.product_name,//产品名称
this.form.desc=res.data.desc,//产品描述
this.form.cate_id=res.data.cate_id,//产品分类id
this.form.lunch_box_fee=res.data.lunch_box_fee,//餐盒费
this.form.is_new=res.data.is_new,//是否新产品
this.form.is_hot=res.data.is_hot,//是否热卖产品
this.form.price=res.data.price,//价格
this.form.activity_price=res.data.activity_price,//秒杀价
this.form.store_count=res.data.store_count ,// 秒杀库存
this.form.activity_id=res.data.activity_id,//秒杀activity_id
this.form.activity_list=res.data.activity_list,//秒杀列表
this.form.limit_num=res.data.limit_num//秒杀限购数量 0 不限制
this.isScanCode=false;
this.codeDisabled=true;//条形码输入框是否禁止输入
this.c_pics=[{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
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;
}
}
}
},
saoma(e){
uni.scanCode({
success:(res) => {
var code = res.result;
uni.request({
url: 'https://www.mxnzp.com/api/barcode/goods/details', //仅为示例，并非真实接口地址。
data: {
barcode:code,
needImg: true,
app_id:'qkkbptetyohxoiod',
app_secret:'Wkp2a3NiNjAzTFJLRmwrZXN3QW1jZz09'
},
method:'GET',
success: (results) => {
if(results.data.code==0){
this.$api.msg(results.data.msg);
}else if(results.data.code==1){
results.code=code;
results.isScanCode=false;
this.findEleProduct(results);
}
}
})
},
fail:(err)=>{
console.log(err)
}
});
},
radioChange(e){
// console.log(this.isType)
this.form.sell_type = e.detail.value
console.log(this.form.sell_type)
},
radioChanges(e){
let index=Number(e.detail.value)-1;
let storeNumber=this.storeNumber;
storeNumber.map(item=>{
item.checked=2;
})
storeNumber[index].checked=1;
this.$set(this,'storeNumber',storeNumber);
},
confirm(e){
console.log(e)
this.cate_name = e.item.cate_name;
this.form.cate_id =e.item.cate_id;
this.index = e.index;
},
pickerone(){
this.$refs.picker.show() // 显示
},
isInt(e){
if(!this.isInteger(e.detail.value)){
this.$api.msg("秒杀库存或限购数量不能为小数");
}
},
//分类选中
bindPickerChange(e){
console.info(e.detail.value);
this.cate_name = this.chindformList[e.detail.value].cate_name;
this.form.cate_id = this.chindformList[e.detail.value].cate_id;
this.index = e.detail.value;
},
//标记选中属性列表
checkboxChange(e){
this.selchildList = e.detail.value;
this.isshowsetkilltime = e.detail.value.indexOf('is_seckill') ==-1? false:true;
if(this.isshowsetkilltime){
this.form.activity_list ="49,"
}else{
this.form.activity_list =""
}
this.selchildList = e.detail.value;
},
//修改的时候赋初始值
async eleProductInfofun(){
let res = await eleProductInfo({
product_id:this.product_id,
});
// console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
if(res.code==0){
this.linkage_product_id = res.data.linkage_product_id
this.bools = res.data.product_name;
this.defaultinfo = res.data;
this.form.product_name = res.data.product_name;//名称
this.form.desc = res.data.desc;//描述
this.form.lunch_box_fee = res.data.lunch_box_fee/100;//餐盒费
this.form.price = res.data.price;//价格
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.classValue = res.data.product_name
this.form.specifications = res.data.gram
// quality_guarantee_period:this.qualitYears*365+this.qualityMonths*30+this.qualityDays, //保质期（月）
// manufacture_date:'' , //生产日期
// manufacturer :'', ///生产厂商
// brand :'', // 品牌
this.form.quality_guarantee_period = res.data.quality_guarantee_period
this.qualitYears = parseInt(res.data.quality_guarantee_period/365)
this.qualityMonths = parseInt((res.data.quality_guarantee_period%365)/30)
this.qualityDays = parseInt((res.data.quality_guarantee_period%365)%30)
this.form.manufacture_date = res.data.manufacture_date
this.form.manufacturer = res.data.manufacturer
this.form.brand = res.data.brand
// 2020-10-22 添加字段
this.form.stock = res.data.stock, //商品库存
this.form.cost_price = res.data.cost_price/100, //进货价钱
this.form.code = res.data.code , //条形编码
this.form.commission = res.data.commission, //返佣比例
this.form.sell_type = res.data.sell_type, // 售卖类型
// this.form.commodity_data:{}, //原始商品名
// 2020-10-22 添加字段
// this.commodity_type = ordinary
//下拉分类 初始值
this.chindformList.forEach((item,index)=>{
if(item.cate_id==res.data.cate_id){
this.index =index;
this.cate_name = item.cate_name;
}
});
// this.classValue = res.data.product_name
if(res.data.commodity_type == 'ordinary') {
this.ordinary.map(item=>{
if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name
}
})
}else if(res.data.commodity_type == 'weigh'){
console.log(res.data.commodity_type,585555555555555555555555)
this.weigh.map(item=>{
if(this.linkage_product_id == item.product_id){
this.classValue = item.product_name
console.log(this.classValue,item.product_name)
}
console.log(this.classValue)
})
}else{
this.classValue = '';
}
console.log(this.classValue)
//属性选默认值
if(res.data.is_new==1){
this.selchildList.push("is_new");
this.listchind[0].checked = true;
}else{
this.listchind[0].checked = false;
}
if(res.data.is_hot==1){
this.selchildList.push("is_hot");
this.listchind[1].checked = true;
}else{
this.listchind[1].checked = false;
}
if(res.data.activity_list == '49,'){
this.listissetkill[0].checked = true
this.isshowsetkilltime = true
this.form.activity_list = res.data.activity_list
let indexlist = this.seckilltimelist.filter((item,index)=>{
if(item.activity_id==this.form.activity_id){
return item
}
})
let temparr = indexlist[0]
let index = this.seckilltimelist.indexOf(temparr)
this.ischeckedtime[0] = index
}
//处理上传的图片默认值
this.c_pics = [{code:0,data:res.data.photo,msg:"success",time:"1587101904"}];
this.form.photo = res.data.photo;
this.c_photos = ["res.data.photo"]
}else{
this.$api.msg(res.msg);
}
},
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;
}
// quality_guarantee_period = this.qualitYears*365 + this.qualityMonths*30 + this.qualityDays
// console.log(this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1)
// if(this.c_pics.length == 0){
// this.$api.msg('产品图片未上传');
// }
let can = {
linkage_id:this.linkage_id,
gram:this.form.specifications, //商品规格
quality_guarantee_period : this.qualitYears*365+this.qualityMonths*30+this.qualityDays*1, //保质期（月）
manufacture_date :this.form.manufacture_date, //生产日期
manufacturer: this.form.manufacturer, ///生产厂商
brand : this.form.brand, // 品牌
// stock:this.form.stock, //商品库存
cost_price:this.form.cost_price, //进货价钱
code:this.form.code,//条形编码
sell_type:this.form.sell_type,
commission:this.form.commission, //返佣比例
commodity_data:this.form.commodity_data, //产品数据
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,//价格
cate_id:this.form.cate_id,
photo:this.c_pics[0].data, //图片
activity_price:this.form.activity_price,//秒杀价
store_count:this.form.store_count ,//秒杀库存
activity_id:this.form.activity_id,//秒杀时间id
activity_list:this.form.activity_list,
limit_num:this.form.limit_num ,//秒杀限购数量
};
this.storeNumber.map((item,index)=>{
if(item.checked==1){
if(index==0){
can.stock = this.stock_number
}else{
can.stock = '-'+ this.stock_number
}
}
})
// if(this.stockType==1){
// console.log(this.stockType,1111111111)
// can.stock = this.stock_number
// }else{
// can.stock = '-'+this.stock_number
// console.log(this.stockType,1111111111)
// }
if(this.selchildList.includes("is_new")){
can.is_new = 1;
}else{
can.is_new = 0;
}
if(this.selchildList.includes("is_hot")){
can.is_hot = 1;
}else{
can.is_hot = 0;
}
if(this.product_id!="" && this.is_datashow !=false ){
can.action = "edit";
can.product_id = this.product_id;
}
//添加修改外卖产品
console.log('这里了')
addEditEleProduct(can).then((res1)=>{
console.log(can)
console.log(res1)
if(res1.code==0){
this.$api.msg(res1.msg);
setTimeout(()=>{
// let pages = getCurrentPages()
// var prevPage = pages[pages.length - 2];
// prevPage.$vm.searchProduct();
uni.navigateBack({});
},1000)
}else{
this.$api.msg(res1.msg);
}
})
},
pickerChange(e){
console.log(e)
this.form.activity_id = this.seckilltimelist[e.detail.value[0]].activity_id;
},
// 秒杀列表
async getActivityListfun(){
let res = await getActivityList({
audit:2,
})
if(res.code==0){
this.seckilltimelist = res.data.head
}
},
//获取外卖分类列表 用于下拉选择
async typeManagerfun(){
let res = await typeManager({});
if(res.code==0){
this.chindformList = res.data;
if(this.product_id!=undefined && this.product_id!=""){
this.eleProductInfofun();
}
}else{
this.$api.msg(res.msg);
}
},
// 判断是否为整数
isInteger(obj){
return obj%1 === 0;
},
//图片上传
c_delImage(e) {
// console.log(e,'反对发射点')
let arr = []
for (let k in e.allImages) {
arr[k] = e.allImages[k].id
}
this.c_photos = arr
},
c_onImg1(e) {
this.isScanCode=true;
this.c_pics = e.allImages
const obj = e.allImages
for (let index in obj) {
let id = obj[index].data
this.c_photos[index] = id
}
},
onMove_c(e) {
this.c_pics = e;
// console.log(e,'反对法地方')
const obj = e
for (let index in obj) {
let id = obj[index].data
this.c_photos[index] = id
}
}
},
}
</script>
<style lang="scss">
@import "../edit/product/addProjuct.scss";
page{
background: #fff;
}
.productpages{
background: #FFFFFF;
}
.submitbtn{
margin: 60upx 24upx;
height:88upx;
line-height: 88upx;
text-align: center;
background:rgba(254,197,156,1);
border-radius:6upx;
font-size:32upx;
color:rgba(255,255,255,1);
}
.submitbtn.active{
background: #FF6900;
}
.briefIntroduction,.Specificationsbox,.addmigs,.checkboxs{
border-bottom:1px solid #F5F2F2;
border-radius: 0 !important;
}
.img{
width: 100upx;height: 100upx;
}
.input1::-ms-input-placeholder {
text-align: center;
}
.input1::-webkit-input-placeholder {
text-align: center;
}
</style>
\ No newline at end of file
pages/eleProduct/eleProduct.vue
View file @ 48225b9e
......@@ -3,16 +3,27 @@
<!-- 产品 -->
<view class="ProductManage pb-100 yocode">
<!-- <view class="projuctTab flex" style="background-color: #EEEEEE;justify-content: center;align-items:center ;">
<view class="" style="width: 65%;">
<input type="searchInput" value="" placeholder="搜索" style=" " />
</view>
<view class="" style="width: 90upx;height: 90upx;" >
<view class="projuctTab flex" style="justify-content: center;align-items:center ;">
<view class="" style="width: 70upx;height: 70upx;background-color: #EEEEEE;" @click="saoma">
<image src="../../static/icon/1.png" mode="" style="display: inline;"></image>
</view>
</view> -->
<view class="flex" style="align-items: center;justify-content: center;margin-left: 30upx;" >
<view class="" >
<input type="text" value="" @input="inputkeys" v-model="keywords" placeholder="搜索要修改的产品" style="background-color: #eee; height: 60upx; border-radius: 20upx; width:460upx;" />
<text style="position: absolute;top: 0;right: 144upx;" v-if="keywords!=''" @click="clearWord">x</text>
</view>
<view class="" style="margin-left: 10px;" @click="searchProduct">
<text >搜索</text>
</view>
</view>
</view>
<!-- tab切换 -->
<view class="projuctTab flex">
<view class="projuctTab flex" v-if="edit==0">
<view class="tabitems flex1" :class="{active:tabactive==1}" @tap="taggletab(1)">
<view class="tabtitle">出售中</view>
<!-- （{{count[0]}}） -->
......@@ -23,10 +34,33 @@
</view>
</view>
<view class="projuctlist" v-if="goods_list.length!=0">
<!-- <view class="projuctlist" v-if="goods_list.length!=0">
<checkbox-group @change="checkboxChange" v-model="idArr">
<view class="itempro flex " v-for="(item,index) in goods_list" :key="index">
<label class="ali-c">
<checkbox :value="item.id.toString()" :checked="item.checked==true" />
</label>
<image class="thumbnail" :src="staticUrl + item.photo" mode=""></image>
<view class="infobox" style="width: 60%;">
<view class="title oneline">{{item.product_name}}</view>
<view class="time">上架时间：{{item.create_time}}</view>
<view class="price">¥{{item.price}}元</view>
</view>
<view class="btnbox flex">
<view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view>
<view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view>
<view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view>
<view class="btns btnboxdel" @tap="tochanges(item,index)">修 改</view>
</view>
</view>
</checkbox-group>
</view> -->
<view class="projuctlist" v-if="goods_list.length!=0 && edit==0">
<checkbox-group @change="checkboxChange" v-model="idArr">
<!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in goods_list" :key="index">
<!-- <label class="ali-c">
......@@ -38,7 +72,6 @@
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view class="price">¥{{item.price}}元</view>
</view>
<view class="btnbox flex">
<view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view>
<view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view>
......@@ -50,14 +83,69 @@
</view>
</view>
</checkbox-group>
</view>
<view class="projuctlist" v-if="goods_list.length!=0 && edit==1">
<checkbox-group @change="checkboxChange" v-model="idArr">
<!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in goods_list" :key="index">
<!-- <label class="ali-c">
<checkbox :value="item.id.toString()" :checked="item.checked==true" />
</label> -->
<image class="thumbnail" :src="staticUrl + item.photo" mode=""></image>
<view class="infobox" style="width: 60%;">
<view class="title oneline">{{item.product_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view class="price">¥{{item.price}}元</view>
<!-- <view class="price" ></view> -->
<view class="price" v-if="item.code !='' && item.code!=0" >编码:{{item.code}}</view>
</view>
<view class="btnbox flex">
<!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view>
<view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view>
<view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> -->
<view class="btns btnboxdel" @tap="editPrice(item,index)" style="width: 160upx;">修改价格</view>
</view>
</view>
</checkbox-group>
</view>
<view class="projuctlist" v-if="goods_list.length!=0 && edit== 2">
<checkbox-group @change="checkboxChange" v-model="idArr">
<!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in goods_list" :key="index">
<!-- <label class="ali-c">
<checkbox :value="item.id.toString()" :checked="item.checked==true" />
</label> -->
<image class="thumbnail" :src="staticUrl + item.photo" mode=""></image>
<view class="infobox" style="width: 60%;">
<view class="title oneline">{{item.product_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view class="price">库存：{{item.code.length == 13 || item.code.length == 0 ?item.stock:item.stock/1000}} {{item.code.length == 13 || item.code.length == 0 ?'件':'kg'}}</view>
<view class="price" v-if="item.code !='' && item.code!=0" >编码:{{item.code}}</view>
</view>
<view class="btnbox flex">
<!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view>
<view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view>
<view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view>
<view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> -->
<view class="btns btnboxdel" @tap="editStore(item,index)" style="width: 160upx;">修改库存</view>
</view>
</view>
</checkbox-group>
</view>
<empty v-if="goods_list.length==0"></empty>
<!-- footchindbox 底部栏 -->
<view class="footchindbox flex ali-c jus-b">
<view class="footchindbox flex ali-c jus-b" v-if="edit==0">
<!-- <checkbox-group @change="radioChange" v-model="datas" >
<label class="uni-list-cell uni-list-cell-pd flex ali-c" >
<view class="chbox">
......@@ -73,9 +161,9 @@
<view class="btns btns2" v-show="tabactive==2" @tap="sold_outfun('all',0)">上架</view>
</view> -->
<!-- <view @click="open" class="submitbtns">添加</view> -->
<navigator :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " class="submitbtns">添加</navigator>
<navigator :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " class="submitbtns" >添加</navigator>
</view>
<!-- -->
<pageScrollTo v-if="isshowtop" ></pageScrollTo>
<!-- <uniPopup ref="popup" type="bottom" >
<view class="" style="background-color: #fff;">
......@@ -90,7 +178,7 @@
</template>
<script>
// import { goods_product_list, sold_out,sold_outAll} from "@/utils/api/store.js";
// import { goods_product_list, sold_out,sold_outAll} from "@/utils/api/store.js"; 接口名：eleProductList，搜索字段 keywords， scan_code = 1扫码进来的
import pageScrollTo from "@/components/pageScrollTo/pageScrollTo.vue"
import empty from "@/components/empty/empty.vue"
import uniPopup from '@/components/uni-popup/uni-popup.vue'
......@@ -114,11 +202,19 @@
idArr:["16535","7350","6164"],//全选 选中的id
isselect:2,//1 是抽奖选择商品状态 2是默认的
sendindex:0,//修改数据插入索引
activity_type:0
activity_type:0,
edit:0,
keywords:'',
isScanCode:'',
productData:[],
isSearch:true
};
},
onLoad(opdata){
this.edit = opdata.edit
console.log(this.edit)
this.activity_type = opdata.activity_type
if(opdata.isselect==1){
......@@ -127,15 +223,15 @@
}else{
this.isselect = 2;
}
},
onShow() {
// console.log(this.$refs.popup)
this.goods_list = [];
this.page = 0;
this.page = 1;
this.isallshow=false;
this.goods_product_list();
// this.goods_product_list();
this.searchProduct();
},
computed: {
staticUrl () {//静态资源地址
......@@ -151,15 +247,67 @@
}
},
onReachBottom(){
console.log("11");
if(!this.isallshow){
// if(this.isSearch){
this.goods_product_list();
// }
}
},
methods:{
clearWord(){
this.keywords = ''
},
inputkeys(){
this.isScanCode = ''
console.log(this.isScanCode)
console.log('asdadasdadadadsada');
},
searchProduct(){
console.log(this.keywords)
let son = ''
if(this.edit == 1){
son = ''
}else if(this.edit == 2){
son=1
}
eleProductList({
keywords:this.keywords,
scan_code:this.isScanCode,
son:son,
}).then(res=>{
if(res.code == 0){
// console.log(res.data)
this.isSearch = false
if(res.data.length == 0){
this.$api.msg('没有找到此商品')
}else{
this.goods_list = res.data
}
}
})
},
saoma(){
uni.scanCode({
success: (res) => {
this.isScanCode = 1
this.keywords = res.result
console.log(this.keywords)
console.log(this.isScanCode)
this.searchProduct()
},
fail: (err) => {
console.log(res.err)
}
})
},
addeleproduct(){
console.log('外卖')
// :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' "
......@@ -181,6 +329,17 @@
url:`/pages/addEditEleProduct/addEditEleProduct?id=${data.product_id}&activity_type=${this.activity_type}&isadd=1`,
})
},
editStore(data,index){
uni.navigateTo({
url:`/pages/addEditEleProduct/editProductStore?id=${data.product_id}`,
})
},
editPrice(data,index){
uni.navigateTo({
url:`/pages/addEditEleProduct/editProductPrice?id=${data.product_id}`,
})
},
//删除外卖产品
async deleteEleProductfun(data,index){
let res = await deleteEleProduct({
......@@ -199,18 +358,26 @@
uni.showLoading({
title: '加载中...'
});
let son = ''
if(this.edit == 1){
son = ''
}else if(this.edit == 2){
son=1
}
this.page++;
let res = await eleProductList({
closed:this.tabactive-1,//上下架状态（0上架，1下架）
page:this.page,
son:son
});
uni.hideLoading();//结束加载
if(res.code==0){
// if(this.page==0){
// this.count = res.data.count;
// }
if(res.data!=null && res.data.length!=0){
console.log(res.data)
console.log(res.data.length)
if(res.data!=[] && res.data.length!=0){
let data = res.data;
data = data.map((item,index)=>{
item.checked = false;
......
pages/index/index.vue
View file @ 48225b9e
......@@ -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/20.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/6.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/22.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/8.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/people.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/coupon.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/turntable/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/psfei.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/psfei.png" mode=""></image></view>
<view>
<image class="img" src="/static/icon/editStore.png" mode=""></image>
</view>
<view>增减库存</view>
</view>
</navigator>
</view> -->
</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
......@@ -310,29 +368,27 @@
this.$refs.Welcome.show();
}, 2000)
if( (plus.device.getVolume() * 1000) < 600 ){ //获取手机音量
//#ifdef APP-PLUS
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)
}
},
});
if(uni.getSystemInfoSync().platform!='ios'){
getApp().hgServiceFun(); //安卓后台运行
console.log('走到后台运行这')
}
getApp().hgServiceFun()
//#endif
},
//下拉刷新
onPullDownRefresh() {
......@@ -341,75 +397,104 @@
},
onShow() {
this.storeIndexfun();
// 判断用户有没有绑定手机号
console.log(this.$store.state.Timer,'啊啊啊啊啊啊啊啊啊啊啊');
getApp().getnewsRemind().then((res)=>{
if(res){
if(this.$store.state.Timer==''){
let Timer=setInterval(()=>{
if (uni.getSystemInfoSync().platform != 'ios') {
getApp().getnewsRemind().then((res) => {
console.log(res)
if (res) {
if (this.$store.state.Timer == '') {
let Timer = setInterval(() => {
getApp().getnewsRemind(2);
console.log('这里');
},5000);
this.$store.commit('Timer',Timer);
}, 5000);
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() {
......@@ -423,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 {
......@@ -437,7 +522,7 @@
</script>
<style lang="scss">
.index {
.index {
background: #fff;
.H50 {
......@@ -491,7 +576,7 @@
.jiu_min .img {
width: 64upx;
height: 64upx;
margin-bottom: 20upx;
margin-bottom: 10upx;
}
.mo {
......@@ -567,5 +652,5 @@
border-bottom: 1px solid #f4f4f4;
font-size: 24upx;
}
}
}
</style>
pages/order/detail/detail.vue
View file @ 48225b9e
......@@ -23,11 +23,11 @@
</view>
</view>
<view class="" v-if="products.length!=0">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" style="height: 200upx;">
<view class='tag-e' v-if="products[0].productname!='快捷支付'" >
<view class="goods " v-for="(item,index) of products" :key="index">
<image class="img" :src="staticUrl+item.photo" mode=""></image>
<view class='goods_02'><strong><strong><strong><strong><strong><strong></strong></strong></strong></strong></strong></strong>
<view class='goods_02' style="height: 200upx;">
<view class='goods_title'>{{item.product_name}}</view>
<view class="goods_des">{{item.desc}}</view>
<view class="goods_des">取餐码：{{detail.delivery_num}}</view>
......@@ -39,13 +39,17 @@
</view>
</view>
</view>
<view class='tag-e' v-else>
<view class="goods ">
<view class='goods_title'>快捷支付</view>
</view>
</view>
</view>
<view class="total">总计：¥ {{detail.total}}</view>
<view class="mess">
<view class="mess_01">订单信息</view>
<view class="mess_02">
......
pages/order/shopOrder.vue
View file @ 48225b9e
......@@ -57,7 +57,10 @@
</view>
</view>
</view>
<view class="pricebox flex ali-c jus-b">
<view class="order_foot flex jus-e mb-20 " >
<view class="heji"><text class="fuhao">{{item.username_tel}}</text></view>
</view>
<view class="pricebox flex ali-c jus-b" style="margin-top: 20upx;">
<!-- 剩余时间 只有待支付的时候有 未付款的时候才有 -->
<view class="titme oneline flex1" v-if="item.status==4">退款原因:{{item.refund_details}}</view>
<view v-else></view>
......
pages/setup/setup.vue
View file @ 48225b9e
......@@ -7,6 +7,12 @@
<text class="cell-tit">门店信息</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<view class="list-cell b-b m-t" hover-class="cell-hover" :hover-stay-time="50" @click="qiDong">
<text class="cell-tit">允许后台自启</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</view>
<navigator url="/pages/edit/Qualifications/Qualifications" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">相关资质</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
......@@ -133,8 +139,13 @@
}
},
methods:{
qiDong(){
const pushLive = uni.requireNativePlugin('push-live');
pushLive.gotoWhiteListSetting()
},
//联系客服
go(){
uni.makePhoneCall({
// 手机号
......@@ -214,6 +225,8 @@
},
//显示弹窗 清除缓存的
toLogoutone(){
// console.log(this.$store.state.Timer,'退出登入')
// this.$store.Timer
this.$refs.moduPopupTwo.show();
},
//退出登录
......@@ -229,7 +242,8 @@
this.$store.commit('changeuserInfo', {});
uni.setStorageSync('userInfo', {});
uni.clearStorage();
clearInterval(this.$store.state.Timer)
this.$store.state.Timer = ''
setTimeout(()=>{
// uni.navigateBack();
uni.navigateTo({
......
static/icon/psfei.png
View replaced file @ c12e1f71 View file @ 48225b9e
static/icon/psfei.png

8.28 KB | W: | H:

static/icon/psfei.png

3.42 KB | W: | H:

static/icon/psfei.png
static/icon/psfei.png
static/icon/psfei.png
static/icon/psfei.png
  • 2-up
  • Swipe
  • Onion skin
static/news/printer.png
View replaced file @ c12e1f71 View file @ 48225b9e
static/news/printer.png

1.04 KB | W: | H:

static/news/printer.png

2.82 KB | W: | H:

static/news/printer.png
static/news/printer.png
static/news/printer.png
static/news/printer.png
  • 2-up
  • Swipe
  • Onion skin
utils/api/api.js
View file @ 48225b9e
......@@ -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 @ 48225b9e
......@@ -45,3 +45,8 @@ export function getskipShop(data){
export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true});
}
utils/debug.js
View file @ 48225b9e
......@@ -5,11 +5,9 @@ module.exports = {
isdebug:false,//正式
//isdebug:true,//测试
// isdebug:false,//正式
isdebug:true,//测试
xqdebug:false,//正式权限
......
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