Commit 228fcbf1 authored by zhengke's avatar zhengke

修改

parent f92b0a37
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{{storeinfo.storeName?storeinfo.storeName:'暂无数据'}} {{storeinfo.storeName?storeinfo.storeName:'暂无数据'}}
</view> </view>
<view class="c-t-r"> <view class="c-t-r">
距离:{{storeinfo.distance?(storeinfo.distance>=1000?(storeinfo.distance/1000).toFixed(2)+'km':storeinfo.distance+'m'):"0"}} 距离:{{storeinfo.distance>1?storeinfo.distance+'km':(storeinfo.distance*1000)+'m'}}
</view> </view>
</view> </view>
<view class="address"> <view class="address">
......
...@@ -120,6 +120,8 @@ ...@@ -120,6 +120,8 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-start; align-items: flex-start;
color:#111111;
font-family: aa;
} }
.designerDetail .serve { .designerDetail .serve {
...@@ -390,7 +392,7 @@ ...@@ -390,7 +392,7 @@
<view class="d-info"> <view class="d-info">
<view class="d-i-item"> <view class="d-i-item">
<text style="width: 45px;">简介:</text> <text style="width: 45px;">简介:</text>
<view style="padding-bottom: 10px;flex:1;border-bottom: 1px solid #E2E2E2;">{{personal.Introduction!=null && personal.Introduction!=''?personal.Introduction:'暂无'}}</view> <view style="padding-bottom: 10px;flex:1;border-bottom: 1px solid #E2E2E2;line-height: 20px;">{{personal.Introduction!=null && personal.Introduction!=''?personal.Introduction:'暂无'}}</view>
</view> </view>
<view class="d-i-item" style="margin-top: 10px;"> <view class="d-i-item" style="margin-top: 10px;">
<text style="width: 45px;">店名:</text> <text style="width: 45px;">店名:</text>
...@@ -398,7 +400,7 @@ ...@@ -398,7 +400,7 @@
{{personal.StoreName}} {{personal.StoreName}}
<view style="display: flex;flex-direction: row;align-items: center;color: #1B1D1E;margin-top: 8px;"> <view style="display: flex;flex-direction: row;align-items: center;color: #1B1D1E;margin-top: 8px;">
<u-icon name="location" color="#CCCCCC" size="23" style='margin-right: 5px;'></u-icon> <u-icon name="location" color="#CCCCCC" size="23" style='margin-right: 5px;'></u-icon>
{{personal.StoreAddress}} <text style="font-size:12px;color:#1B1D1E">{{personal.StoreAddress}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -417,10 +419,10 @@ ...@@ -417,10 +419,10 @@
<view v-for="(cl, ci) in allCoupon" :key="ci" @click="gocoupon(cl)"> <view v-for="(cl, ci) in allCoupon" :key="ci" @click="gocoupon(cl)">
<view class="setmeal-item" :style="{'margin-left':ci==0?'15px':'0','margin-right': ci+1==allCoupon.length?'15px':'5px'}"> <view class="setmeal-item" :style="{'margin-left':ci==0?'15px':'0','margin-right': ci+1==allCoupon.length?'15px':'5px'}">
<view class="setmeal-item-top"> <view class="setmeal-item-top">
<view style="font-size: 14px;margin-bottom: 3px;" class="setmeal-name">{{cl.Name}}</view> <view style="font-size: 14px;" class="setmeal-name">{{cl.Name}}</view>
<view style="font-size: 11px;color: rgba(239, 220, 203, 0.6);" class="setmeal-name">{{cl.Describe}}</view> <view style="font-size: 11px;color: rgba(239, 220, 203, 0.6);margin:3px 0;" class="setmeal-name">{{cl.Describe}}</view>
<view class="setmeal-price"> <view class="setmeal-price">
<text style="font-size: 13px;">核销次数:{{cl.TotalNum}}</text> <text style="font-size: 13px;">核销次数:{{cl.HeXiao}}</text>
</view> </view>
<view class="setmeal-pl" style="left: -9px;"></view> <view class="setmeal-pl" style="left: -9px;"></view>
<view class="setmeal-pl" style="right: -9px;"> </view> <view class="setmeal-pl" style="right: -9px;"> </view>
......
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
{{g.storeAddress?g.storeAddress:''}} {{g.storeAddress?g.storeAddress:''}}
</view> </view>
<view style="font-size: 11px;color: #999999;margin-top: 5px;"> <view style="font-size: 11px;color: #999999;margin-top: 5px;">
距离你当前位置{{g.distance>=1000?(g.distance/1000).toFixed(2)+'km':g.distance+'m'}} 距离你当前位置{{g.distance>1?g.distance+'km':(g.distance*1000)+'m'}}
</view> </view>
</view> </view>
<view class="right u-skeleton-rect" @click="gophone" style="height: 34px;display: flex;flex-direction: column;align-items: center;justify-content: space-between;"> <view class="right u-skeleton-rect" @click="gophone" style="height: 34px;display: flex;flex-direction: column;align-items: center;justify-content: space-between;">
...@@ -419,10 +419,10 @@ ...@@ -419,10 +419,10 @@
<view v-for="(cl, ci) in allCoupon" :key="ci" @click="gocoupon(cl)" v-if="allCoupon.length>0"> <view v-for="(cl, ci) in allCoupon" :key="ci" @click="gocoupon(cl)" v-if="allCoupon.length>0">
<view class="setmeal-item u-skeleton-rect" :style="{'margin-left':ci==0?'15px':'0','margin-right': ci+1==allCoupon.length?'15px':'5px'}"> <view class="setmeal-item u-skeleton-rect" :style="{'margin-left':ci==0?'15px':'0','margin-right': ci+1==allCoupon.length?'15px':'5px'}">
<view class="setmeal-item-top"> <view class="setmeal-item-top">
<view style="font-size: 14px;margin-bottom: 3px;" class="setmeal-name">{{cl.Name}}</view> <view style="font-size: 14px;" class="setmeal-name">{{cl.Name}}</view>
<view style="font-size: 11px;color: rgba(239, 220, 203, 0.6);" class="setmeal-name">{{cl.Describe}}</view> <view style="font-size: 11px;color: rgba(239, 220, 203, 0.6);margin: 3px 0;" class="setmeal-name">{{cl.Describe}}</view>
<view class="setmeal-price"> <view class="setmeal-price">
<text style="font-size: 13px;">核销次数:{{cl.TotalNum}}</text> <text style="font-size: 13px;">核销次数:{{cl.HeXiao}}</text>
</view> </view>
<view class="setmeal-pl" style="left: -9px;"></view> <view class="setmeal-pl" style="left: -9px;"></view>
<view class="setmeal-pl" style="right: -9px;"> </view> <view class="setmeal-pl" style="right: -9px;"> </view>
...@@ -582,7 +582,8 @@ ...@@ -582,7 +582,8 @@
detailContent: "", detailContent: "",
personalList:[], personalList:[],
allCoupon:[], allCoupon:[],
count:0 count:0,
positionObj:{} //位置
} }
}, },
onLoad(option){ onLoad(option){
...@@ -620,11 +621,12 @@ ...@@ -620,11 +621,12 @@
//当传过来有主播名称的时候 存入缓存 //当传过来有主播名称的时候 存入缓存
uni.setStorageSync("AnchorName", { AnchorName: option.AnchorName }); uni.setStorageSync("AnchorName", { AnchorName: option.AnchorName });
} }
this.positionObj = uni.getStorageSync("position");
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
this.init(); this.init();
this.getSPList()//获取服务人员列表 this.getSPList()//获取服务人员列表
this.getAllCPList()//获取门店套餐卡 this.getAllCPList()//获取门店套餐卡
wx.showShareMenu({ wx.showShareMenu({
withShareTicket: true, withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"], menus: ["shareAppMessage", "shareTimeline"],
...@@ -749,6 +751,7 @@ ...@@ -749,6 +751,7 @@
url: "/api/AppletStores/GetStoreInfo", url: "/api/AppletStores/GetStoreInfo",
data: { data: {
storeId: this.id, storeId: this.id,
position: this.positionObj.position
}, },
}, },
(res) => { (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