Skip to content

M
mallapp
Commit b2245a18 authored by 黄奎's avatar 黄奎
Browse files
Options

商城修改

parent 2edaff60
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 61 deletions
components/search/index.vue
View file @ b2245a18
<template>
<!-- <van-search
<!-- <van-search
:value="val"
:placeholder="styleStr.placeholder"
:background="styleStr.background"
......@@ -9,63 +9,57 @@
:custom-style='postionStyle'
readonly
/> -->
<view class="search-box" :style="{ background: bg }" @click="goSearch">
<u-search
:placeholder="styleStr.placeholder"
v-model="val"
:input-align="styleStr.textPosition"
:value="val"
:bg-color="styleStr.color"
:text-color="styleStr.textColor"
:radius="styleStr.radius"
:show-action="false"
:margin="marginStyle"
></u-search>
</view>
<view class="search-box" :style="{ background: bg }" @click="goSearch">
<u-search :placeholder="styleStr.placeholder" v-model="val" :input-align="styleStr.textPosition" :value="val"
:bg-color="styleStr.color" :text-color="styleStr.textColor" :radius="styleStr.radius" :show-action="false"
:margin="marginStyle"></u-search>
</view>
</template>
<script>
export default {
props: ["styleStr"],
data() {
return {
val: "",
formatStyle: "",
postionStyle: "",
bg: "",
marginStyle:""
};
},
created() {
if (
this.styleStr.background && this.styleStr.background.indexOf("#") == -1 &&
this.styleStr.background.indexOf("rgb") == -1
) {
this.bg = "#" + this.styleStr.background;
} else {
this.bg = this.styleStr.background;
}
this.marginStyle=`${this.styleStr.top??0}px ${this.styleStr.right??0}px ${this.styleStr.bottom??0}px ${this.styleStr.left??0}px `
// if (this.styleStr.p) {
// let p = this.styleStr.p;
// this.postionStyle = `position:${p.position};left:${p.left}px;width:${p.width};top:${p.top}px;z-index:9999999;`;
// }
//console.log(this.postionStyle);
},
methods: {
goSearch(){
uni.navigateTo({
url: '/pages/search/search'
});
}
},
};
export default {
props: ["styleStr"],
data() {
return {
val: "",
formatStyle: "",
postionStyle: "",
bg: "",
marginStyle: ""
};
},
created() {
if (
this.styleStr.background && this.styleStr.background.indexOf("#") == -1 &&
this.styleStr.background.indexOf("rgb") == -1
) {
this.bg = "#" + this.styleStr.background;
} else {
this.bg = this.styleStr.background;
}
this.marginStyle =
`${this.styleStr.top??0}px ${this.styleStr.right??0}px ${this.styleStr.bottom??0}px ${this.styleStr.left??0}px `
// if (this.styleStr.p) {
// let p = this.styleStr.p;
// this.postionStyle = `position:${p.position};left:${p.left}px;width:${p.width};top:${p.top}px;z-index:9999999;`;
// }
//console.log(this.postionStyle);
},
methods: {
goSearch() {
uni.navigateTo({
url: '/pages/search/search'
});
}
},
};
</script>
<style>
.search-box {
padding: 5px;
position: relative;
z-index: 2;
}
.search-box {
padding: 5px;
position: relative;
z-index: 2;
}
</style>
pages/goods/goods.vue
View file @ b2245a18
......@@ -219,10 +219,10 @@
<text>限招人数</text>
<text class="information-list2">{{g.edu_data.ClassPersion}}人</text>
</view>
<view class="information-list" v-if='g.edu_data.TeacherName'>
<!-- <view class="information-list" v-if='g.edu_data.TeacherName'>
<text>班主任</text>
<text class="information-list2">{{g.edu_data.TeacherName}}</text>
</view>
</view> -->
<view class="information-list" v-if='g.edu_data.TeacherName'>
<text>上课老师</text>
<text class="information-list2">{{g.edu_data.TeacherName}}</text>
......
pages/order/index/index.vue
View file @ b2245a18
......@@ -56,10 +56,10 @@
<!-- TODO 样式结构修改-->
<view class="handle">
<u-button shape="circle" size="medium" :custom-style="customStyle" v-on:click.stop="cancel(item, index)" v-if="
item.OrderStatus == '1'&&item.OrderEduType>0">取消订单</u-button>
item.OrderStatus == '1'&&item.OrderEduType>0&&u.TenantId!=27">取消订单</u-button>
<view class="" v-if="item.OrderEduType===0">
<u-button shape="circle" size="medium" :custom-style="customStyle" v-on:click.stop="cancel(item, index)" v-if="
item.OrderStatus == '1' || (item.OrderStatus == '2' && item.PresentFXGrade!=1)">取消订单</u-button>
<u-button shape="circle" size="medium" :custom-style="customStyle" v-on:click.stop="cancel(item, index)" v-if="u.TenantId!=27&&
item.OrderStatus == '1' || (item.OrderStatus == '2' && item.PresentFXGrade!=1&&u.TenantId!=27)">取消订单</u-button>
</view>
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(item)" v-if="item.OrderStatus == '1'">立即支付</u-button>
<u-button shape="circle" size="medium" :custom-style="item.OrderStatus == '3' ? customStyle : themCustomStyle"
......@@ -199,7 +199,9 @@
onLoad: function(option) {
//option为object类型，会序列化上个页面传递的参数
this.current = option.status || -1;
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
......@@ -215,6 +217,7 @@
this.msg.pageIndex = 1;
this.g = [];
this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
this.request2({
url: '/api/order/GetOrderStatusEnumList',
data: {}
......
pages/order/order-detail.vue
View file @ b2245a18
......@@ -49,6 +49,10 @@
{{y}}
</text>
</view>
<view class="good-attr22">
<view v-if="x.EduData.ClassTime&&u.TenantId==27">上课时间:{{x.EduData.ClassTime}}</view>
<text v-if="x.EduData.ClassNum &&u.TenantId==27">课程数量:{{x.EduData.ClassNum}}</text>
</view>
<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;"
@click.native.stop="goUrl(x.FreeShippingUrl)"
v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
......@@ -59,6 +63,8 @@
</view>
</view>
<view class="good-price">￥{{ x.Final_Price }}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" class="bindingg" v-for="(attr2, inde4x) in x.GoodsRelevanceList" >已选物品:{{attr2.RelevanceName}}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" v-for="(attr2, inde4x) in x.GoodsRelevanceList" class="good-price">￥{{ attr2.RelevancePrice }}</view>
</view>
</view>
<template v-for="(e, ei) in expressInfo">
......@@ -188,12 +194,12 @@
</u-button>
</view>
<view class="">
<view class="item" v-if="orders.OrderStatus == '1'&&orders.OrderEduType> 0 ">
<view class="item" v-if="orders.OrderStatus == '1'&&orders.OrderEduType> 0 &&u.TenantId!=27">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
<view class="item"
v-if="(orders.OrderStatus == '1' || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1))&&orders.OrderEduType === 0 ">
v-if="(orders.OrderStatus == '1'&&u.TenantId!=27 || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1&&u.TenantId!=27))&&orders.OrderEduType === 0 &&u.TenantId!=27">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
......@@ -261,6 +267,7 @@
},
data() {
return {
u:{},
mc: "",
secondary: "",
headStyle: {},
......@@ -308,6 +315,7 @@
};
},
onLoad(option) {
this.u = uni.getStorageSync("mall_UserInfo");
this.id = option.id || 63702;
//zk新增
if (option.NewUserId) {
......@@ -371,6 +379,7 @@
);
},
cancel() {
this.showModal = true;
this.Cancelmsg.OrderId = this.orders.OrderId;
this.Cancelmsg.Type = this.orders.OrderStatus;
......@@ -540,6 +549,17 @@
</script>
<style>
.good-attr22{
font-size: 13px;
font-weight: 500;
}
.bindingg{
color: gray;
font-size: 26rpx;
margin-top: 20rpx;
margin-bottom: 10rpx;
}
.orderdetail {
overflow: hidden;
background: #f3f4f6;
......
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