Commit 110ada4a authored by Mac's avatar Mac

1

parent 86f7d1e0
...@@ -150,9 +150,11 @@ ...@@ -150,9 +150,11 @@
}, },
getAppletGoodsCommentStatistics() { getAppletGoodsCommentStatistics() {
this.request2({ this.request2({
url: "/api/AppletGuideCar/GetAppletGoodsCommentStatistics", url: "/api/AppletStores/GetAppletGoodsCommentStatistics",
data: { data: {
GoodsId: this.msg.GoodsId GoodsId: this.msg.GoodsId,
StoreId:this.msg.GoodsId==0 && this.msg.ServicePersonalId==0?this.msg.StoreId:0,
ServicePersonalId:this.msg.ServicePersonalId,
}, },
}, },
(res) => { (res) => {
......
...@@ -650,7 +650,7 @@ ...@@ -650,7 +650,7 @@
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (this.u) { if (this.u) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/reserve/subscribe?id=" + this.storeId, url: "/pages/reserve/subscribe?id=" + this.storeId+'&servicePersionId='+x.ID,
}) })
} else { } else {
this.showAuth = true; this.showAuth = true;
...@@ -677,7 +677,8 @@ ...@@ -677,7 +677,8 @@
this.personal.ServiceLogo+'&Name='+this.personal.Name+ this.personal.ServiceLogo+'&Name='+this.personal.Name+
'&storeId='+this.storeId+'&ID='+this.ID '&storeId='+this.storeId+'&ID='+this.ID
}) })
} },
}, },
}; };
</script> </script>
...@@ -258,9 +258,11 @@ ...@@ -258,9 +258,11 @@
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
let storeId = uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId ? uni.getStorageSync("storeId")
.storeId : 0;
this.request2({ this.request2({
url: '/api/AppletStores/GetReserveCouponDetail', url: '/api/AppletStores/GetReserveCouponDetail',
data: {ID:this.ID} data: {ID:this.ID,StoreId:storeId}
}, },
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
......
...@@ -6,8 +6,22 @@ ...@@ -6,8 +6,22 @@
overflow: hidden; overflow: hidden;
margin-top: 7px; margin-top: 7px;
"> ">
<view class="sortbox">
<view class="item" @click="change(1,1)" :style="{ color: msg.OrderBy == 1 || msg.OrderBy == 2 ? mainColor : '#222' }"
style="display: flex; justify-content: center;">
<text>评分</text>
<u-icon v-if="msg.OrderBy==1||msg.OrderBy==2" :name="msg.OrderBy == 1 ? 'descending' : 'ascending'" size="36" :color="msg.OrderBy == 1 || msg.OrderBy == 2 ? mainColor : '#222'"></u-icon>
</view>
<view class="item" :style="{ color: msg.OrderBy == 3 || msg.OrderBy==4 ? mainColor : '#222' }" style="display: flex; justify-content: center;"
@click="change(2,2)">
<text>热度</text>
<u-icon v-if="msg.OrderBy==3||msg.OrderBy==4" :name="msg.OrderBy == 3 ? 'descending' : 'ascending'" size="36" :color="msg.OrderBy == 3 || msg.OrderBy==4 ? mainColor : '#222'"></u-icon>
</view>
</view>
<scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop" <scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop"
style="height: 100%; padding-bottom: 0px;"> style="height:calc(100vh - 40px); padding-bottom: 0px;">
<view class="designer " > <view class="designer " >
<view class="designer-item" v-for="(x, ci2) in g" :key="ci2" v-if="g.length>0"> <view class="designer-item" v-for="(x, ci2) in g" :key="ci2" v-if="g.length>0">
<view class="designer-flex" style="width: calc(100vw - 100px);"> <view class="designer-flex" style="width: calc(100vw - 100px);">
...@@ -31,7 +45,7 @@ ...@@ -31,7 +45,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="designer-btn" :style="{'background':mainColor}" > <view class="designer-btn" :style="{'background':mainColor}" @click="gosubscribe(x)">
预约 预约
</view> </view>
</view> </view>
...@@ -53,17 +67,22 @@ ...@@ -53,17 +67,22 @@
</template> </template>
<script> <script>
import auth from "@/components/auth/index";
export default { export default {
components: {
auth,
},
data() { data() {
return { return {
showAuth:false,
pageTitle: "设计师列表", pageTitle: "设计师列表",
status: "loadmore", status: "loadmore",
mainColor: "", mainColor: "",
loading: true, loading: true,
page_count: 1, page_count: 1,
g: [], g: [],
u:{},
loadText: { loadText: {
loadmore: "轻轻上拉,加载更多", loadmore: "轻轻上拉,加载更多",
loading: "努力加载中", loading: "努力加载中",
...@@ -75,6 +94,7 @@ ...@@ -75,6 +94,7 @@
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
StoreId: 0, StoreId: 0,
OrderBy:0,
}, },
}; };
}, },
...@@ -95,7 +115,28 @@ ...@@ -95,7 +115,28 @@
}, },
methods: { methods: {
change(sort, t) {
//评分
if (t == 1) {
if (this.msg.OrderBy != 2) {
this.msg.OrderBy = 2; //升序
} else {
this.msg.OrderBy = 1; //降序
}
}
//热度
if (t == 2) {
if (this.msg.OrderBy !=4 ) {
this.msg.OrderBy = 4; //升序
} else {
this.msg.OrderBy = 3; //降序
}
}
this.g = [];
this.msg.pageIndex = 1
this.init();
},
init() { init() {
...@@ -104,7 +145,7 @@ ...@@ -104,7 +145,7 @@
title: '加载中' title: '加载中'
}); });
this.request2({ this.request2({
url: '/api/AppletStores/GetServicePersonalList', url: '/api/AppletStores/GetServicePersonalDetailList',
data: this.msg data: this.msg
}, },
res => { res => {
...@@ -136,6 +177,24 @@ ...@@ -136,6 +177,24 @@
this.status = "nomore"; this.status = "nomore";
} }
}, },
gosubscribe(x){
this.u = uni.getStorageSync("mall_UserInfo");
if (this.u) {
uni.navigateTo({
url: "/pages/reserve/subscribe?id="+this.msg.StoreId+'&servicePersionId='+x.ID,
})
} else {
this.showAuth = true;
}
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
},
}, },
...@@ -182,5 +241,18 @@ ...@@ -182,5 +241,18 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.personalList .sortbox {
display: flex;
background: #fff;
border-bottom: 1px solid #E2E2E2;
}
.personalList .sortbox .item {
height: 40px;
line-height: 40px;
flex: 1;
text-align: center;
}
</style> </style>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
></u-rate> ></u-rate>
</view> </view>
<view style="font-size: 11px;color: #111111;margin-top: 10px;" class="u-skeleton-rect"> <view style="font-size: 11px;color: #111111;margin-top: 10px;" class="u-skeleton-rect">
营业 {{g.storeServiceTime?g.storeServiceTime:'全天'}}营业 营业时间 {{g.storeServiceTime?g.storeServiceTime:'全天'}}营业
</view> </view>
</view> </view>
<view class="right u-skeleton-rect" @click="openShare"> <view class="right u-skeleton-rect" @click="openShare">
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="designer-btn" :style="{'background':mc}" @click.stop="gosubscribe"> <view class="designer-btn" :style="{'background':mc}" @click.stop="gosubscribe(x)">
预约 预约
</view> </view>
</view> </view>
...@@ -517,7 +517,7 @@ ...@@ -517,7 +517,7 @@
<h-parse :content="detailContent" @navigate="clickDescription"></h-parse> <h-parse :content="detailContent" @navigate="clickDescription"></h-parse>
</view> </view>
<view class="btn"> <view class="btn">
<view class="btn-box" :style="{'background':mc}" @click="gosubscribe"> <view class="btn-box" :style="{'background':mc}" @click="gosubscribe2()">
预约 预约
</view> </view>
</view> </view>
...@@ -909,7 +909,16 @@ ...@@ -909,7 +909,16 @@
url: "/pages/reserve/commentList?StoreId="+this.id, url: "/pages/reserve/commentList?StoreId="+this.id,
}) })
}, },
gosubscribe(){ gosubscribe(x){
if (this.u) {
uni.navigateTo({
url: "/pages/reserve/subscribe?id="+this.id+'&servicePersionId='+x.ID,
})
} else {
this.showAuth = true;
}
},
gosubscribe2(){
if (this.u) { if (this.u) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/reserve/subscribe?id="+this.id, url: "/pages/reserve/subscribe?id="+this.id,
......
...@@ -188,9 +188,19 @@ ...@@ -188,9 +188,19 @@
uni.setStorageSync("storeId", {storeId:item.Id}); uni.setStorageSync("storeId", {storeId:item.Id});
this.currentChosen = item.Id this.currentChosen = item.Id
uni.navigateTo({ let pages = getCurrentPages(); // 当前页面
url: "/pages/reserve/storeDetails?id="+item.Id, let beforePage = pages[pages.length - 2]; // 前一个页面
}); setTimeout(()=>{
uni.navigateBack({
delta:1,
success: function() {
beforePage.$vm.getCurrentStore(); // 执行前一个页面的方法
}
});
},100)
// uni.navigateTo({
// url: "/pages/reserve/storeDetails?id="+item.Id,
// });
}, },
radioChange(e){ radioChange(e){
uni.setStorageSync("storeId", {storeId:this.currentChosen}); uni.setStorageSync("storeId", {storeId:this.currentChosen});
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
'color':c.DayDateStr== selectDay?'#FF4048':'#888888', 'color':c.DayDateStr== selectDay?'#FF4048':'#888888',
}"> }">
<text>{{c.WeekDayStr}}</text> <text>{{c.WeekDayStr}}</text>
<text style="margin-top: 3px;">{{c.DayDateStr}}</text> <text style="margin-top: 3px;">{{c.DayDateStr?(c.DayDateStr.split('-')[1]+'-'+c.DayDateStr.split('-')[2]):''}}</text>
<view class="offline" :style="{'background':c.DayDateStr== selectDay?'#FF4048':'#FFF',}"></view> <view class="offline" :style="{'background':c.DayDateStr== selectDay?'#FF4048':'#FFF',}"></view>
</view> </view>
</view> </view>
...@@ -457,6 +457,7 @@ ...@@ -457,6 +457,7 @@
Nosubmit:true, Nosubmit:true,
Income:0, Income:0,
EduCationMoney:0, EduCationMoney:0,
servicePersionId:0,
}; };
}, },
...@@ -472,6 +473,11 @@ ...@@ -472,6 +473,11 @@
this.GoodsId = option.GoodsId this.GoodsId = option.GoodsId
this.GetApplOGInfo()//商品详情 this.GetApplOGInfo()//商品详情
} }
if(option && option.servicePersionId){
this.servicePersionId = option.servicePersionId
}
this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId; this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId;
}, },
...@@ -577,11 +583,11 @@ ...@@ -577,11 +583,11 @@
}); });
this.request2({ this.request2({
url: '/api/AppletGoods/GetAppletOfflineGoodsInfo', url: '/api/AppletGoods/GetAppletOfflineGoodsInfo',
data: {GoodsId:this.GoodsId,StoreId: this.id} data: {GoodsId:this.GoodsId,StoreId: this.id,servicePersionId:this.servicePersionId}
}, },
res => { res => {
uni.hideLoading(); uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1&& res.data!=null) {
if(res.data && res.data.goods){ if(res.data && res.data.goods){
this.goods = res.data.goods; this.goods = res.data.goods;
this.payInfo.GoodsName = this.goods.name.slice(0,10); this.payInfo.GoodsName = this.goods.name.slice(0,10);
......
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