Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let into dev
This commit is contained in:
commit
4d63fca8fb
|
@ -60,6 +60,7 @@
|
||||||
<view class="shop-content" style="width: 490rpx;">
|
<view class="shop-content" style="width: 490rpx;">
|
||||||
<view class="title">
|
<view class="title">
|
||||||
<view class="name u-line-2">{{item.name}}</view>
|
<view class="name u-line-2">{{item.name}}</view>
|
||||||
|
<!-- <view class="tip u-line-1">{{item.spec}}</view> -->
|
||||||
<view class="tip u-line-1">{{item.unit_name}}</view>
|
<view class="tip u-line-1">{{item.unit_name}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="price-btn">
|
<view class="price-btn">
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
还剩<text>{{countDown}}</text>订单自动取消
|
还剩<text>{{countDown}}</text>订单自动取消
|
||||||
</view>
|
</view>
|
||||||
<view class="m-card m-address" style="margin-top: 20rpx;">
|
<view class="m-card m-address" style="margin-top: 20rpx;">
|
||||||
<view class="address-info">
|
<view class="address-info" @click="callPhone(shopInfo.service_phone)">
|
||||||
<view class="top" style="align-items: flex-start;">
|
<view class="top" style="align-items: flex-start;">
|
||||||
<view style="color: #333;display: flex;align-items: center;">
|
<view style="color: #333;display: flex;align-items: center;">
|
||||||
<up-icon name="map"></up-icon>
|
<up-icon name="map"></up-icon>
|
||||||
|
@ -20,8 +20,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="address-btn">
|
<view class="address-btn" v-if="shopInfo.paid==0">
|
||||||
<view style="width: 80px;"><up-button @click="shopListShow=true" size="small" shape="circle"
|
<view style="width: 80px;"><up-button @click.stop="shopListShow=true" size="small" shape="circle"
|
||||||
color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
|
color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -384,6 +384,13 @@
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 拨打电话
|
||||||
|
const callPhone = (phone)=>{
|
||||||
|
uni.makePhoneCall({
|
||||||
|
phoneNumber: phone
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
onLoad((option) => {
|
onLoad((option) => {
|
||||||
uni.setNavigationBarTitle({
|
uni.setNavigationBarTitle({
|
||||||
|
|
Loading…
Reference in New Issue