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