Skip to content

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

srf

parent f008b3a8
Show whitespace changes
Inline Side-by-side
Showing with 187 additions and 217 deletions
pages/edit/pro_manage/pro_manage.vue
View file @ ea4296ad
...@@ -72,9 +72,14 @@ ...@@ -72,9 +72,14 @@
isshowall:true, isshowall:true,
isselect:"2", isselect:"2",
sendindex:"", sendindex:"",
money_type:""
} }
}, },
onLoad(opdata) { onLoad(opdata) {
console.info(opdata)
this.money_type=opdata.money_type;
if(opdata.isselect==1){ if(opdata.isselect==1){
this.isselect = 1; this.isselect = 1;
this.sendindex = opdata.sendindex;//插入索引 this.sendindex = opdata.sendindex;//插入索引
...@@ -268,7 +273,7 @@ ...@@ -268,7 +273,7 @@
jump_edit(item) { jump_edit(item) {
uni.navigateTo({ uni.navigateTo({
//url: '/pages/edit/product/product?id=' + id //url: '/pages/edit/product/product?id=' + id
url:"/pages/edit/product/addshop?id="+item.goods_id, url:"/pages/edit/product/addshop?id="+item.goods_id+'&money_type='+this.money_type,
}) })
}, },
//tab切换事件 //tab切换事件
......
pages/edit/product/addshop.vue
View file @ ea4296ad
...@@ -128,12 +128,17 @@ ...@@ -128,12 +128,17 @@
</view> </view>
<!-- 富文本 --> <!-- 富文本 -->
<view class="noecellbox" v-show="money_type==3">
<view class="title">佣金金额</view>
<view class="inputbox flex">
<input class="input flex1" type="text" v-model="canform.money" value="" placeholder-class="plclass" placeholder="请填写产品名称" />
</view>
</view>
<!-- 多选列表 勾选的位置 --> <!-- 多选列表 勾选的位置 -->
<view class="checkboxs"> <view class="checkboxs">
<view class="title">标识：</view> <view class="title">标识：</view>
<!-- 表特和类目 -->
<checkbox-group @change="checkboxChange"> <checkbox-group @change="checkboxChange">
<view class="chindlost ali-c flex flex-wrap"> <view class="chindlost ali-c flex flex-wrap">
<label class="lableitem flex ali-c" v-for="(item,index) in listchind" :key="index"> <label class="lableitem flex ali-c" v-for="(item,index) in listchind" :key="index">
...@@ -179,6 +184,7 @@ ...@@ -179,6 +184,7 @@
}, },
data() { data() {
return { return {
money_type:"",//佣金
myProps: { myProps: {
label: 'value', label: 'value',
value: 'cate_id', value: 'cate_id',
...@@ -228,6 +234,7 @@ ...@@ -228,6 +234,7 @@
is_new:"0",//0 1 是否新产品 is_new:"0",//0 1 是否新产品
is_hot:"0",//0 1 是否热卖产品 is_hot:"0",//0 1 是否热卖产品
action:"add",//方式（添加：add，修改:edit） action:"add",//方式（添加：add，修改:edit）
money:''
}, },
goodsCate:[], goodsCate:[],
...@@ -259,6 +266,9 @@ ...@@ -259,6 +266,9 @@
} }
}, },
onLoad(opdata) { onLoad(opdata) {
console.info(opdata)
this.money_type=opdata.money_type
if(opdata.id!="" && opdata.id!=undefined){ if(opdata.id!="" && opdata.id!=undefined){
this.canform.goods_id = opdata.id;//修改的商品id this.canform.goods_id = opdata.id;//修改的商品id
this.canform.action = "edit"; this.canform.action = "edit";
...@@ -306,7 +316,7 @@ ...@@ -306,7 +316,7 @@
this.canform.details = res.data.details;///商品详情（编辑器插件） this.canform.details = res.data.details;///商品详情（编辑器插件）
this.canform.num = res.data.num;//库存 num this.canform.num = res.data.num;//库存 num
this.canform.cate_id = res.data.cate_id;//产品分类 this.canform.cate_id = res.data.cate_id;//产品分类
this.canform.money = res.data.money;//佣金
//处理分类初始值 //处理分类初始值
for(let i=0;i<this.goodsCate.length;i++){ for(let i=0;i<this.goodsCate.length;i++){
......
pages/index/index.vue
View file @ ea4296ad
...@@ -3,41 +3,36 @@ ...@@ -3,41 +3,36 @@
<view class="index"> <view class="index">
<view class="head"> <view class="head">
<!-- @tap="demoaudio" --> <!-- @tap="demoaudio" -->
<view class="tit">店铺名称:{{storeinfo.shop_name}} </view> <view class="tit">店铺名称:{{ storeinfo.shop_name }}</view>
<!-- {{shop.shop_name}} --> <!-- {{shop.shop_name}} -->
<view class="jiu"> <view class="jiu">
<view class="jiu_01"> <view class="jiu_01">
<navigator url="/pages/notice/notice"> <navigator url="/pages/notice/notice">
<view> <view><image class="img" src="/static/icon/newsicon.png" mode=""></image></view>
<image class="img" src="/static/icon/newsicon.png" mode=""></image>
</view>
<view>消息通知</view> <view>消息通知</view>
</navigator> </navigator>
</view> </view>
<view class="jiu_01"> <view class="jiu_01">
<navigator url="/pages/user/tongji/tongji"> <navigator url="/pages/user/tongji/tongji">
<view> <view><image class="img" src="/static/icon/zijinicons.png" mode=""></image></view>
<image class="img" src="/static/icon/zijinicons.png" mode=""></image>
</view>
<view>商户资金管理</view> <view>商户资金管理</view>
</navigator> </navigator>
</view> </view>
<view class="jiu_01 "> <view class="jiu_01 ">
<navigator url="/pages/user/mingxi/mingxi"> <navigator url="/pages/user/mingxi/mingxi">
<view> <view><image class="img" src="/static/icon/3.png" mode=""></image></view>
<image class="img" src="/static/icon/3.png" mode=""></image>
</view>
<view>佣金明细</view> <view>佣金明细</view>
</navigator> </navigator>
</view> </view>
</view> </view>
</view> </view>
<view class="more"> <view class="more">
<view class='mo'> <view class="mo">
<view class='mo_01'>数据交易</view> <view class="mo_01">数据交易</view>
<navigator url="/pages/user/tongji/tongji"> <navigator url="/pages/user/tongji/tongji">
<view class='mo_02'>更多 <uni-icon type="arrowright" size="15" color="#D6D6D6"></uni-icon> <view class="mo_02">
更多
<uni-icon type="arrowright" size="15" color="#D6D6D6"></uni-icon>
</view> </view>
</navigator> </navigator>
</view> </view>
...@@ -45,91 +40,76 @@ ...@@ -45,91 +40,76 @@
<navigator url="/pages/user/tongji/tongji" class="shuju"> <navigator url="/pages/user/tongji/tongji" class="shuju">
<view class="shuju_01"> <view class="shuju_01">
<view>今日订单/今日收益</view> <view>今日订单/今日收益</view>
<view class="shuju_01_s" v-if="countdata.order_day">{{countdata.order_day}}/￥{{countdata.money_day}}</view> <view class="shuju_01_s" v-if="countdata.order_day">{{ countdata.order_day }}/￥{{ countdata.money_day }}</view>
<view class="shuju_01_s" v-else>0 / ¥0</view> <view class="shuju_01_s" v-else>0 / ¥0</view>
</view> </view>
<view class="shuju_01 no"> <view class="shuju_01 no">
<view>昨日订单/金额</view> <view>昨日订单/金额</view>
<view class="shuju_01_s" v-if="countdata.order_yesterday">{{countdata.order_yesterday}} /¥{{countdata.money_yesterday}}</view> <view class="shuju_01_s" v-if="countdata.order_yesterday">{{ countdata.order_yesterday }} /¥{{ countdata.money_yesterday }}</view>
<view class="shuju_01_s" v-else>0 / ¥0</view> <view class="shuju_01_s" v-else>0 / ¥0</view>
</view> </view>
<view class="shuju_01"> <view class="shuju_01">
<view>总订单数</view> <view>总订单数</view>
<view class="shuju_01_s" v-if="countdata.total_order">{{countdata.total_order}}</view> <view class="shuju_01_s" v-if="countdata.total_order">{{ countdata.total_order }}</view>
<view class="shuju_01_s" v-else>0</view> <view class="shuju_01_s" v-else>0</view>
</view> </view>
<view class="shuju_01 no"> <view class="shuju_01 no">
<view>总收入</view> <view>总收入</view>
<view class="shuju_01_s" v-if="countdata.money">¥ {{countdata.money}}</view> <view class="shuju_01_s" v-if="countdata.money">¥ {{ countdata.money }}</view>
<view class="shuju_01_s" v-else>￥0 </view> <view class="shuju_01_s" v-else>￥0</view>
</view> </view>
</navigator> </navigator>
<view class="BH"></view> <view class="BH"></view>
<view class="six"> <view class="six">
<view class="jiu_max" v-if="shop_type=='goods'"> <view class="jiu_max" v-if="shop_type == 'goods'" @tap="jump">
<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></view>
<image class="img" src="/static/icon/20.png" mode=""></image>
</view>
<view>商品管理</view> <view>商品管理</view>
</view> </view>
</navigator> <!-- </navigator> -->
</view> </view>
<view class="jiu_max " v-if="shop_type=='ele'"> <view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/eleProduct/eleProduct"> <navigator url="/pages/eleProduct/eleProduct">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/20.png" mode=""></image></view>
<image class="img" src="/static/icon/20.png" mode=""></image>
</view>
<view>外卖产品</view> <view>外卖产品</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- 酒店管理 --> <!-- 酒店管理 -->
<view class="jiu_max " v-if="shop_type=='hotel'"> <view class="jiu_max " v-if="shop_type == 'hotel'">
<navigator url="/pages/HotelManage/HotelManage"> <navigator url="/pages/HotelManage/HotelManage">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/20.png" mode=""></image></view>
<image class="img" src="/static/icon/20.png" mode=""></image>
</view>
<view>酒店管理</view> <view>酒店管理</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- 商城不要分类 这个是外卖的--> <!-- 商城不要分类 这个是外卖的-->
<view class="jiu_max" v-if="shop_type=='ele'"> <view class="jiu_max" v-if="shop_type == 'ele'">
<navigator url="/pages/shopCategory/shopCategory?type=1"> <navigator url="/pages/shopCategory/shopCategory?type=1">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/6.png" mode=""></image></view>
<image class="img" src="/static/icon/6.png" mode=""></image>
</view>
<view>商品分类</view> <view>商品分类</view>
</view> </view>
</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/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></view>
<image class="img" src="/static/icon/6.png" mode=""></image>
</view>
<view>商品分类</view> <view>商品分类</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- <view class="jiu_01"> <!-- <view class="jiu_01">
<navigator url="/pages/shopCategory/shopCategory?type=2"> <navigator url="/pages/shopCategory/shopCategory?type=2">
<view> <view>
...@@ -139,91 +119,72 @@ ...@@ -139,91 +119,72 @@
</navigator> </navigator>
</view> --> </view> -->
<!-- 只有商城才有规格 外卖没有规格 --> <!-- 只有商城才有规格 外卖没有规格 -->
<!-- v-if="shop_type=='goods'" --> <!-- v-if="shop_type=='goods'" -->
<!-- 商城和外卖都有规格 --> <!-- 商城和外卖都有规格 -->
<view class="jiu_max"> <view class="jiu_max">
<navigator url="/pages/specs/specs?type=2"> <navigator url="/pages/specs/specs?type=2">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/22.png" mode=""></image></view>
<image class="img" src="/static/icon/22.png" mode=""></image>
</view>
<view>商品规格</view> <view>商品规格</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<view class="jiu_max" v-if="shop_type == 'ele'">
<view class="jiu_max" v-if="shop_type=='ele'">
<!-- 外卖订单 --> <!-- 外卖订单 -->
<navigator url="/pages/order/order"> <navigator url="/pages/order/order">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/8.png" mode=""></image></view>
<image class="img" src="/static/icon/8.png" mode=""></image>
</view>
<view>订单管理</view> <view>订单管理</view>
</view> </view>
</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></view>
<image class="img" src="/static/icon/8.png" mode=""></image>
</view>
<view>订单管理</view> <view>订单管理</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- 酒店的订单 酒店订单管理--> <!-- 酒店的订单 酒店订单管理-->
<view class="jiu_max" v-if="shop_type=='hotel'"> <view class="jiu_max" v-if="shop_type == 'hotel'">
<!-- 酒店的订单 --> <!-- 酒店的订单 -->
<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></view>
<image class="img" src="/static/icon/8.png" mode=""></image>
</view>
<view>订单管理</view> <view>订单管理</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<view class="jiu_max "> <view class="jiu_max ">
<navigator url="/pages/kehu/kehu"> <navigator url="/pages/kehu/kehu">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/icon/people.png" mode=""></image></view>
<image class="img" src="/static/icon/people.png" mode=""></image>
</view>
<view>锁客列表</view> <view>锁客列表</view>
</view> </view>
</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/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></view>
<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
</view>
<view>抽奖活动</view> <view>抽奖活动</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<view class="jiu_max "> <view class="jiu_max ">
<navigator url="/pages/CardSend/CardSend"> <navigator url="/pages/CardSend/CardSend">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/news/coupon.png" mode=""></image></view>
<image class="img" src="/static/news/coupon.png" mode=""></image>
</view>
<view>优惠券管理</view> <view>优惠券管理</view>
</view> </view>
</navigator> </navigator>
...@@ -232,38 +193,26 @@ ...@@ -232,38 +193,26 @@
<view class="jiu_max "> <view class="jiu_max ">
<navigator url="/pages/Printer/AddPrinter"> <navigator url="/pages/Printer/AddPrinter">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/news/printer.png" mode=""></image></view>
<image class="img" src="/static/news/printer.png" mode=""></image>
</view>
<view>添加打印机</view> <view>添加打印机</view>
</view> </view>
</navigator> </navigator>
</view> </view>
<view class="jiu_max " @tap="shops"> <view class="jiu_max " @tap="shops">
<view class="jiu_min"> <view class="jiu_min">
<view> <view><image class="img" src="/static/turntable/turntable.png" mode=""></image></view>
<image class="img" src="/static/turntable/turntable.png" mode=""></image>
</view>
<view>大转盘</view> <view>大转盘</view>
</view> </view>
</view> </view>
</view> </view>
<view class="BH"></view> <view class="BH"></view>
<yomol-upgrade ref="yomolUpgrade"></yomol-upgrade> <yomol-upgrade ref="yomolUpgrade"></yomol-upgrade>
<!-- 升级组件 --> <!-- 升级组件 -->
<Welcome ref="Welcome"></Welcome> <Welcome ref="Welcome"></Welcome>
<!-- 欢迎回来 --> <!-- 欢迎回来 -->
</view> </view>
</template> </template>
...@@ -285,7 +234,8 @@ ...@@ -285,7 +234,8 @@
shop: {}, shop: {},
countdata: {}, countdata: {},
shop_type: "", //店铺类型 ele goods shop_type: "", //店铺类型 ele goods
is_luck_draw:"" is_luck_draw:"",
money_type:""
} }
}, },
components: { components: {
...@@ -332,7 +282,12 @@ ...@@ -332,7 +282,12 @@
}, 1000) }, 1000)
}, },
methods: { methods: {
jump(){
uni.navigateTo({
url:'/pages/edit/pro_manage/pro_manage?money_type='+this.money_type
})
},
shops(){ shops(){
...@@ -420,6 +375,7 @@ ...@@ -420,6 +375,7 @@
this.shop_id = res.data.shop_info.shop_id; this.shop_id = res.data.shop_info.shop_id;
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
} else { } else {
this.$api.msg(res.msg); this.$api.msg(res.msg);
...@@ -430,9 +386,8 @@ ...@@ -430,9 +386,8 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.index { .index {
background: #fff; background: #fff;
.H50 { .H50 {
...@@ -501,20 +456,20 @@ ...@@ -501,20 +456,20 @@
width: 80%; width: 80%;
height: 40upx; height: 40upx;
overflow: hidden; overflow: hidden;
border-left: 6upx solid #EC521B; border-left: 6upx solid #ec521b;
font-size: 28upx; font-size: 28upx;
font-weight: bold; font-weight: bold;
} }
.mo_01 span { .mo_01 span {
color: #8E8E8E; color: #8e8e8e;
font-weight: 100; font-weight: 100;
font-size: 24upx; font-size: 24upx;
padding-left: 20upx; padding-left: 20upx;
} }
.mo_02 { .mo_02 {
color: #D6D6D6; color: #d6d6d6;
} }
.shuju { .shuju {
...@@ -535,7 +490,7 @@ ...@@ -535,7 +490,7 @@
} }
.shuju_01_s { .shuju_01_s {
color: #EB511B; color: #eb511b;
font-weight: 800; font-weight: 800;
font-size: 32upx; font-size: 32upx;
} }
...@@ -545,7 +500,7 @@ ...@@ -545,7 +500,7 @@
} }
.BH { .BH {
background-color: #F1F1F1; background-color: #f1f1f1;
height: 10upx; height: 10upx;
} }
...@@ -557,8 +512,8 @@ ...@@ -557,8 +512,8 @@
.list_01 { .list_01 {
padding: 30upx 20upx 16upx; padding: 30upx 20upx 16upx;
border-bottom: 1px solid #F4F4F4; border-bottom: 1px solid #f4f4f4;
font-size: 24upx; font-size: 24upx;
} }
} }
</style> </style>
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