Commit 23f98d17 authored by Mac's avatar Mac

样式修改

parent 852f7ed3
<template> <template>
<view class="cdetailStyle" :style="{'height':contentHeight}"> <view class="cdetailStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<u-tabs :list="list" :is-scroll="false" :current="msg.AuditStatus" @change="change" :active-color='mainColor' bg-color='#f3f4f6'></u-tabs> <u-tabs height="100" :list="list" :is-scroll="false" :current="msg.AuditStatus" @change="change" :active-color='mainColor' bg-color='#f3f4f6'></u-tabs>
<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty> <u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
<template v-if="g.length > 0"> <template v-if="g.length > 0">
<view <view
......
...@@ -113,17 +113,17 @@ export default { ...@@ -113,17 +113,17 @@ export default {
); );
}, },
gouseUrl(g){ gouseUrl(g){
let data = [] // let data = []
if(g.UseType==1 || g.UseType==2){ // if(g.UseType==1 || g.UseType==2){
g.ProductList.forEach(x=>{ // g.ProductList.forEach(x=>{
data.push(x.ProductId) // data.push(x.ProductId)
}) // })
let id = data.toString() // let id = data.toString()
uni.redirectTo({ url: '/pages/goods/list?coupon_id='+ id+'&UseType='+g.UseType }); // uni.redirectTo({ url: '/pages/goods/list?coupon_id='+ id+'&UseType='+g.UseType });
}else{ // }else{
uni.redirectTo({ url: '/pages/goods/list'}); // uni.redirectTo({ url: '/pages/goods/list'});
} // }
uni.redirectTo({ url: '/pages/index/index'});
} }
}, },
......
...@@ -132,11 +132,11 @@ ...@@ -132,11 +132,11 @@
:navs="d.data" :navs="d.data"
:key="di" :key="di"
></quicknav> ></quicknav>
<pingtuan <!-- <pingtuan
v-if="d.id == 'pintuan'" v-if="d.id == 'pintuan'"
:goods="d.data" :goods="d.data"
:key="di" :key="di"
></pingtuan> ></pingtuan> -->
<shopinfo <shopinfo
v-if="d.id == 'shop-info'" v-if="d.id == 'shop-info'"
:ad="d.data" :ad="d.data"
...@@ -267,7 +267,7 @@ import checkform from "@/components/checkform/index"; ...@@ -267,7 +267,7 @@ import checkform from "@/components/checkform/index";
import addialog from "@/components/addialog/index"; import addialog from "@/components/addialog/index";
import quicknav from "@/components/quicknav/index"; import quicknav from "@/components/quicknav/index";
import coupon from "@/components/coupons/coupons"; import coupon from "@/components/coupons/coupons";
import pingtuan from "@/components/pingtuan/index"; // import pingtuan from "@/components/pingtuan/index";
import shopinfo from "@/components/shopinfo/shopinfo"; import shopinfo from "@/components/shopinfo/shopinfo";
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import guide from "@/components/guidecar/index.vue"; import guide from "@/components/guidecar/index.vue";
...@@ -350,7 +350,7 @@ export default { ...@@ -350,7 +350,7 @@ export default {
addialog, addialog,
quicknav, quicknav,
coupon, coupon,
pingtuan, // pingtuan,
shopinfo, shopinfo,
auth, auth,
guide, guide,
......
<template> <template>
<view class="cteamStyle" :style="{'height':contentHeight}"> <view class="cteamStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<u-tabs :list="list" name="GradeName" :is-scroll="false" :current="current" @change="change" :active-color='mainColor'></u-tabs> <u-tabs height="100" :list="list" name="GradeName" :is-scroll="false" :current="current" @change="change" :active-color='mainColor'></u-tabs>
<view style="width:100%;background:#fff;padding:20px 20px 0 20px;"> <view style="width:100%;background:#fff;padding:20px 20px 0 20px;">
<view style="display:flex;align-items: center;"> <view style="display:flex;align-items: center;">
<u-search :show-action="true" style="width:80%" v-model="msg2.Name" placeholder="请输入用户昵称" action-text="搜索" @custom="msg2.pageIndex = 1,init2(1)" <u-search :show-action="true" style="width:80%" v-model="msg2.Name" placeholder="请输入用户昵称" action-text="搜索" @custom="msg2.pageIndex = 1,init2(1)"
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view> <view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view>
<view class="center_item" style="font-size: 24rpx;color: #FFFFFF;" @click="gosales()"> <view class="center_item" style="font-size: 24rpx;color: #FFFFFF;" @click="gosales()">
<Text>销售额</Text> <Text>销售额</Text>
<Text>{{ sharedata.UserInfo.MySellMoney ? sharedata.UserInfo.MySellMoney.toFixed(0) :0}}</Text> <Text>{{ sharedata.UserInfo && sharedata.UserInfo.MySellMoney ? sharedata.UserInfo.MySellMoney.toFixed(0) :0}}</Text>
</view> </view>
</view> </view>
<!-- 会员购买 --> <!-- 会员购买 -->
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</template> </template>
<script> <script>
//import uCharts from '../school/components/u-charts/u-charts.min.js'; import uCharts from './u-charts/u-charts.min.js';
// import calendar from './cp/fl-calendar.vue' // import calendar from './cp/fl-calendar.vue'
var canvaColumn = null; var canvaColumn = null;
...@@ -288,56 +288,56 @@ ...@@ -288,56 +288,56 @@
}, },
showColumn(canvasId,chartData){ showColumn(canvasId,chartData){
// canvaColumn=new uCharts({ canvaColumn=new uCharts({
// $this:_self, $this:_self,
// canvasId: canvasId, canvasId: canvasId,
// type: 'column', type: 'column',
// fontSize:11, fontSize:11,
// padding:[5,15,15,15], padding:[5,15,15,15],
// legend:{ legend:{
// show:true, show:true,
// position:'top', position:'top',
// float:'center', float:'center',
// itemGap:30, itemGap:30,
// padding:5, padding:5,
// margin:5, margin:5,
// //backgroundColor:'rgba(41,198,90,0.2)', //backgroundColor:'rgba(41,198,90,0.2)',
// //borderColor :'rgba(41,198,90,0.5)', //borderColor :'rgba(41,198,90,0.5)',
// borderWidth :1 borderWidth :1
// }, },
// dataLabel:true, dataLabel:true,
// dataPointShape:true, dataPointShape:true,
// background:'#FFFFFF', background:'#FFFFFF',
// pixelRatio:_self.pixelRatio, pixelRatio:_self.pixelRatio,
// categories: chartData.categories, categories: chartData.categories,
// series: chartData.series, series: chartData.series,
// animation: true, animation: true,
// enableScroll: true, enableScroll: true,
// xAxis: { xAxis: {
// disableGrid:false, disableGrid:false,
// type:'grid', type:'grid',
// gridType:'dash', gridType:'dash',
// itemCount:4, itemCount:4,
// scrollShow:true, scrollShow:true,
// scrollAlign:'right', scrollAlign:'right',
// }, },
// yAxis: { yAxis: {
// //disabled:true //disabled:true
// gridType:'dash', gridType:'dash',
// splitNumber:4, splitNumber:4,
// min:10, min:10,
// max:180, max:180,
// format:(val)=>{return val.toFixed(0)+'元'}//如不写此方法,Y轴刻度默认保留两位小数 format:(val)=>{return val.toFixed(0)+'元'}//如不写此方法,Y轴刻度默认保留两位小数
// }, },
// width: _self.cWidth*_self.pixelRatio, width: _self.cWidth*_self.pixelRatio,
// height: _self.cHeight*_self.pixelRatio, height: _self.cHeight*_self.pixelRatio,
// extra: { extra: {
// column: { column: {
// type:'group', type:'group',
// width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
// } }
// }, },
// }); });
}, },
touchColumn(e){ touchColumn(e){
......
This diff is collapsed.
...@@ -744,7 +744,7 @@ export default { ...@@ -744,7 +744,7 @@ export default {
: 0; : 0;
switch (item.link_url) { switch (item.link_url) {
case "/pages/share/index/index": case "/pages/share/index/index":
if (this.user_info.isShowDistributionCenter == 1) { if (this.user_info.isShowDistributionCenter == 1 && this.user_info && this.user_info.identity && this.user_info.identity.fx_grade_id != 5) {
flag = true; flag = true;
} else { } else {
flag = false; flag = false;
...@@ -805,6 +805,7 @@ export default { ...@@ -805,6 +805,7 @@ export default {
flag = false; flag = false;
} }
break; break;
} }
return flag; return flag;
}, },
......
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