Skip to content

M
mallapp
Commit c6228acd authored by Mac's avatar Mac
Browse files
Options

修改微店

parent 58e3a7d4
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 20 deletions
pages.json
View file @ c6228acd
......@@ -284,6 +284,9 @@
},
{
"path":"storeManagement/addGoods"
},
{
"path":"storeManagement/index"
}
]
......
pages/microShop/index/index.vue
View file @ c6228acd
......@@ -101,7 +101,7 @@
<Text>{{SmallShops.CustomModel.CommissionWithdrawnName}}</Text>
<Text>{{SmallShops.UserInfo.TXCommission!=null ?SmallShops.UserInfo.TXCommission:0}}元</Text>
</view>
<view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view>
<view style="width: 1px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view>
<view class="center_item" style="font-size: 12px;color: #FFFFFF;">
<Text >{{SmallShops.CustomModel.OutstandingCommissionName}}</Text>
<Text>{{SmallShops.UserInfo.WJSCommission!=null ?SmallShops.UserInfo.WJSCommission:0}}元</Text>
......@@ -175,7 +175,7 @@
</view>
<!-- 店铺设置 -->
<view class="sharebox_menus">
<view class="menus_item" @click="goUrl('/pages/microShop/storeManagement/storeManagement')">
<view class="menus_item" @click="goUrl('/pages/microShop/storeManagement/index')">
<view style="display: flex;flex-direction: row;align-items: center;">
<image :src="SmallShops.CustomModel.SmallShopSetUpImage" style="width: 14px;height: auto;" mode='widthFix'></image>
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">{{SmallShops.CustomModel.SmallShopSetUpName}}</text>
......@@ -203,7 +203,7 @@
<view class="agreementbox" v-if='isshowagreement==true || isshowagreement_t == true'></view>
<view class="agreementbox_t" v-if='isshowagreement==true'>
<view class="agreement_b">
<Text style='height: 40px;line-height: 40px;'>分销申请协议</Text>
<Text style='height: 40px;line-height: 40px;'>开店申请协议</Text>
<!-- <view>TODO内容</view> -->
<view style="width: 100%;height: 760rpx;padding: 20rpx;">
<Text>{{shopBasics.model.ApplyAgreement}}</Text>
......@@ -463,7 +463,6 @@
that.fenxqrcode = that.host2+res.data;
// that.fenxqrcode = 'http://192.168.2.16:8088/upfile/temporary/d259ce3f-eee3-4c20-976d-4d054f6f16b3.jpg';
console.log(that.fenxqrcode)
console.log('pages/index/index?user_id=' + UserInfo.UserId+'&SmallShopId='+ UserInfo.SmallShopId)
}
);
},
......
pages/microShop/storeManagement/index.vue 0 → 100644
View file @ c6228acd
<template>
<view class="storeIndextStyle" :style="{'height':contentHeight}">
<view >
<view class="sharebox_menus">
<view class="menus_item" @click="goUrl('/pages/microShop/storeManagement/storeManagement')">
<view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">价格设置</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
pageTitle: "店铺设置",
contentHeight:0,
mainColor:'',
secondary:'',
}
},
onLoad(options){
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
mounted() {
},
methods: {
goUrl(url){
uni.navigateTo({
url: url
});
}
}
}
</script>
<style>
.storeIndextStyle{
background: #f3f4f6;
padding-top: 10px;
}
.storeIndextStyle .sharebox_menus{
width: 94%;
margin-left: 3%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
/* padding: 10px 0; */
margin-top: 10px;
}
.storeIndextStyle .sharebox_menus .menus_item{
width: 100%;
height: 45px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
}
.storeIndextStyle .sharebox_menus .menus_item .item_text{
font-size: 13px;
margin: 5px 0;
}
</style>
pages/microShop/storeManagement/storeManagement.vue
View file @ c6228acd
......@@ -36,13 +36,14 @@
<span style='font-weight: bold;margin-left: 7px;'>单独设置</span>
</view>
<view style="display: flex;flex-direction: row;align-items: center">
<view class="allEdit" @click="addShop" style="width: 80px;">
添加商品
</view>
<view style="width: 75px;height: 40px;display: flex;flex-direction: row;align-items: center;justify-content: center;background: #FFFFFF;" @click="show = true">
<text>筛选</text>
<image src="../../../static/images/shaix.png" style="width: 11px;height: 13px;"></image>
</view>
<view class="allEdit" @click="addShop" style="width: 80px;">
添加商品
</view>
</view>
</view>
......@@ -176,10 +177,6 @@
>
<view class="popupbox">
<text class="popupbox_text" style="margin-top: 15px;">商品ID</text>
<view class="popup_item">
<input class="uni-input inputM" v-model="msg.GoodsId" />
</view>
<text class="popupbox_text" style="margin-top: 15px;">商品名称</text>
<view class="popup_item">
<input class="uni-input inputM" v-model="msg.GoodsName" />
......@@ -562,7 +559,7 @@
justify-content: space-between;
padding: 5px;
margin-top: 10px;
background: #F8F6F5;
background: #F1F1F1;
}
.storeManagementStyle .inputM{
width: 100%;
......
pages/microShop/wdCase.vue
View file @ c6228acd
......@@ -320,7 +320,7 @@
});
that.init()
uni.navigateTo({
url: '/pages/cash-detail/cash-detail'
url: '/pages/microShop/wdWithdrawal'
});
},
(err)=>{
......
pages/microShop/wdOrder.vue
View file @ c6228acd
......@@ -33,13 +33,13 @@
<!-- <Text v-if='item.Grade==0'>自购返佣</Text>
<Text v-if='item.Grade==1'>一级分销</Text>
<Text v-if='item.Grade==2'>二级分销</Text> -->
<text style="margin-left: 15px;">{{item.GradeDescription}}</text>
<text style="margin-left: 15px;">{{item.GradeDescription?item.GradeDescription:''}}</text>
</view>
<view class="center_l">
<Text>{{item.CommissionState==1? '待返佣':'已返佣'}}：<Text :style="{color:mainColor}">{{item.Commission}}</Text>元 </Text>
<u-icon name="arrow" v-if='item.showdetail==false'></u-icon>
<u-icon name="arrow-down" v-if='item.showdetail==true'></u-icon>
<u-icon name="arrow" v-if='item.showdetail==false&& item.DetailList.length >0'></u-icon>
<u-icon name="arrow-down" v-if='item.showdetail==true&& item.DetailList.length >0'></u-icon>
</view>
</view>
<view style="display: flex;flex-direction: column;align-items: center;padding-bottom: 15px;width: 100%;" v-if='item.showdetail==true'>
......@@ -83,7 +83,7 @@
export default {
data() {
return {
pageTitle: "分销订单",
pageTitle: "微店订单",
contentHeight:0,
mainColor:'',
secondary:'',
......
pages/user-center/user-center.vue
View file @ c6228acd
......@@ -126,9 +126,12 @@
:key="index"
:name="item.name"
@click="goUrl(item.link_url)"
v-if="item.name != '分销中心' || user_info.isShowDistributionCenter == 1"
v-if="pandu(item)"
>
<image :src="item.icon_url" :style="{width:meueData.user_center.menu_style == 1 ?'12px':'20px',height: 'auto'}" mode="widthFix"></image>
<image :src="item.icon_url" :style="{width:meueData.user_center.menu_style == 1 ?'12px':'20px',height: 'auto'}" mode="widthFix"
></image>
<Text
:style="{ 'margin-top': meueData.user_center.menu_style == 1 ? '0rpx' : '10rpx', 'margin-left': meueData.user_center.menu_style == 1 ? '10rpx' : '0rpx' }"
>
......@@ -175,6 +178,9 @@ export default {
scrollTop:0,
couponsObj:{},
modelstype:0,//机型类型
shopBasics:{},
mall_UserInfo:{},
};
},
components: {
......@@ -188,6 +194,7 @@ export default {
onLoad() {
this.navHeight = this.$navHeight - 2;
this.u = wx.getStorageSync('basedata').user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):{};
this.nav = uni.getMenuButtonBoundingClientRect().top+'px';
this.headStyle.background = `linear-gradient(to right, '#6E75EA',80%, '#B984EC')`;
this.headStyle.paddingTop = this.nav ;
......@@ -231,7 +238,46 @@ export default {
goHome() {
uni.redirectTo({ url: '/pages/index/main' });
},
pandu(item){
let flag=true;
switch(item.link_url)
{
case "/pages/share/index/index" :
if(this.user_info.isShowDistributionCenter == 1)
{
flag=true;
}
else{
flag=false;
}
break;
case "/pages/microShop/index/index":
//开启
if(this.shopBasics.model.IsOpen==2)
{
if(this.mall_UserInfo.SmallShopId==0 && this.mall_UserInfo.UserSmallShopId!=0)
{
flag=false;
}
else{
flag=true;
}
}
//关闭
else{
if(this.mall_UserInfo.SmallShopId!=0)
{
flag=true;
}
else{
flag=false;
}
}
break;
}
return flag;
},
//获取菜单配置
userinfo() {
uni.showNavigationBarLoading();
......@@ -251,6 +297,21 @@ export default {
})
}
);
this.getMicroShopBasics()
},
getMicroShopBasics(){
this.request2(
{
url: '/api/AppletUser/GetMicroShopBasics',
data: {}
},
(res) => {
this.shopBasics = res.data;
console.log(this.shopBasics.model.IsOpen)
}
);
},
goUrl(url) {
if (url == '/pages/balance/balance') {
......
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