Commit a1ae714d authored by zhengke's avatar zhengke

修改

parent 6189c33f
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
{{ cx.name }} {{ cx.name }}
</view> </view>
<view class="goodsSubName"> <view class="goodsSubName" v-if="setting&&setting.is_show_korea==1">
卖点:{{cx.subName}} 卖点:{{cx.subName}}
</view> </view>
<view class="good-info" v-if="setting&&setting.is_show_korea==0"> <view class="good-info" v-if="setting&&setting.is_show_korea==0">
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
/> />
</view> </view>
<view class="good-name">{{ cx.Name }}</view> <view class="good-name">{{ cx.Name }}</view>
<view class="good-info"> <view class="good-info" v-if="setting&&setting.is_show_korea==0">
<view class="price" :style="{ color: mainColor }">¥{{ <view class="price" :style="{ color: mainColor }">¥{{
cx.SellingPrice cx.SellingPrice
}}</view> }}</view>
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
setting: {}
} }
}, },
components:{ components:{
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
created(){ created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.setting = uni.getStorageSync("basedata").mall.setting;
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<view class="good-info"> <view class="good-info">
<Text class='good-name' @click="clickHandler(cx.GoodsId)">{{cx.GoodsName}}</Text> <Text class='good-name' @click="clickHandler(cx.GoodsId)">{{cx.GoodsName}}</Text>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;"> <view v-if="setting&&setting.is_show_korea==0" style="padding-bottom:10px;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<Text :style="{'color':mainColor}">¥{{cx.Price}}</Text> <Text :style="{'color':mainColor}">¥{{cx.Price}}</Text>
<u-icon name="ellipsis" color="#c8c9cc" size="40" @click.stop='operation(cx.GoodsId,cx.Id,ci)'></u-icon> <u-icon name="ellipsis" color="#c8c9cc" size="40" @click.stop='operation(cx.GoodsId,cx.Id,ci)'></u-icon>
</view> </view>
...@@ -173,6 +173,7 @@ ...@@ -173,6 +173,7 @@
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
setting: {}
} }
}, },
components:{ components:{
...@@ -182,8 +183,7 @@ ...@@ -182,8 +183,7 @@
created(){ created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.setting = uni.getStorageSync("basedata").mall.setting;
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
...@@ -448,8 +448,7 @@ ...@@ -448,8 +448,7 @@
} }
.footStyle .good-info{ .footStyle .good-info{
width: 100%;; width: 100%;;
height:150rpx ; padding: 0 10px;
padding: 0 10rpx;
} }
.footStyle .good-name { .footStyle .good-name {
overflow: hidden; overflow: hidden;
......
...@@ -107,7 +107,6 @@ ...@@ -107,7 +107,6 @@
}, },
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res, '数据');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -169,7 +169,6 @@ ...@@ -169,7 +169,6 @@
}, },
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res, '数据11111');
this.dataList = res.data this.dataList = res.data
} }
} }
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
export default { export default {
data() { data() {
return { return {
pageTitle: '活动列表', pageTitle: '我的活动',
qmsg: { qmsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10 pageSize: 10
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = res.data.pageData; this.dataList = res.data.pageData;
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
console.log(res, '采购数据');
} }
} }
); );
......
...@@ -251,7 +251,6 @@ ...@@ -251,7 +251,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据类了');
this.msg=res.data; this.msg=res.data;
this.msg.FoundingTime = res.data.FoundingTimeStr; this.msg.FoundingTime = res.data.FoundingTimeStr;
} }
...@@ -307,7 +306,6 @@ ...@@ -307,7 +306,6 @@
}, },
btnStart(val) { btnStart(val) {
this.msg.FoundingTime = val.year+'-'+val.month+'-'+val.day; this.msg.FoundingTime = val.year+'-'+val.month+'-'+val.day;
console.log(val);
}, },
}, },
} }
......
...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据来也');
this.dataList = res.data; this.dataList = res.data;
} }
} }
......
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据来也');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</view> </view>
<view class="proDeList"> <view class="proDeList">
<view class="proDeLeft">成立时间</view> <view class="proDeLeft">成立时间</view>
<view class="proDeRight">{{dataList.FoundingTime}}</view> <view class="proDeRight">{{dataList.FoundingTimeStr}}</view>
</view> </view>
<view class="proDeList"> <view class="proDeList">
<view class="proDeLeft">员工人数</view> <view class="proDeLeft">员工人数</view>
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = res.data; this.dataList = res.data;
console.log(res,'采购数据');
} }
} }
); );
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据类了');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据类了');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -187,7 +187,6 @@ ...@@ -187,7 +187,6 @@
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = res.data; this.dataList = res.data;
console.log(res,'采购数据');
} }
} }
); );
......
...@@ -128,7 +128,6 @@ ...@@ -128,7 +128,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据类了');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据类了');
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
} }
......
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.dataList = res.data.pageData; this.dataList = res.data.pageData;
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
console.log(res, '咨询数据');
} }
} }
); );
......
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