blue ui other

vking
1 parent a1360065
Showing 6 changed files with 169 additions and 42 deletions
components/reserve/share/share.wxml
components/reserve/share/share.wxss
pages/reserve/detail.js
pages/reserve/detail.json
pages/reserve/detail.wxml
pages/reserve/detail.wxss
--- a/components/reserve/share/share.wxml
View file @3e2d5cc
+++ b/components/reserve/share/share.wxml
View file @3e2d5cc
 <!--components/reserve/share/share.wxml-->
 <view class="share mask" catchtap="hide" wx:if="{{hasShow}}">
-    <view class="share-view flex-lr">
-        <button class="button-none share-item flex-vc" open-type="share" catchtap="shareDo">
-            <image class="share-img wechat"></image>
-            <view class="share-name">微信</view>
-        </button>
-        <view class="share-item flex-vc" catchtap="shareDo" data-act="quanzi">
-            <image class="share-img quanzi"></image>
-            <view class="share-name">朋友圈</view>
-        </view>
-        <view class="share-item flex-vc" catchtap="shareDo" data-act="qrcode">
-            <image class="share-img qrcode"></image>
-            <view class="share-name">二维码</view>
-        </view>
-        <view class="share-item flex-vc">
-            <share-button type="3" fore-color="#dd6" product="{{product}}" style="height: 100rpx;">
-                <image class="share-img hwq"></image>
-            </share-button>
-            <view class="share-name">好物圈</view>
+    <view class="share-view">
+        <view class="flex-lr" catchtap="catchtap">
+            <button class="button-none share-item flex-vc" open-type="share" catchtap="shareDo">
+                <image class="share-img wechat"></image>
+                <view class="share-name">微信</view>
+            </button>
+            <view class="share-item flex-vc" catchtap="shareDo" data-act="quanzi">
+                <image class="share-img quanzi"></image>
+                <view class="share-name">朋友圈</view>
+            </view>
+            <view class="share-item flex-vc" catchtap="shareDo" data-act="qrcode">
+                <image class="share-img qrcode"></image>
+                <view class="share-name">二维码</view>
+            </view>
+            <view class="share-item flex-vc">
+                <share-button type="3" fore-color="#dd6" product="{{product}}" style="height: 100rpx;">
+                    <image class="share-img hwq"></image>
+                </share-button>
+                <view class="share-name">好物圈</view>
+            </view>
         </view>
+        <view class="cancel">取消</view>
     </view>
 </view>
--- a/components/reserve/share/share.wxss
View file @3e2d5cc
+++ b/components/reserve/share/share.wxss
View file @3e2d5cc
 /* components/reserve/share/share.wxss */
 @import "../../../app.wxss";
 .share-view{
-    height: 260rpx;
-    background: #fefefe;
-    width: calc(100% - 40rpx);
-    padding: 0 20rpx;
+    height: 390rpx;
+    background: #ffffff;
+    width: 100%;
+    padding: 50rpx 50rpx 0rpx;
     position: fixed;
     bottom: 0;
+    border-radius: 40rpx 40rpx 0px 0px;
+    box-sizing: border-box;
 }
 .share-img{
     width: 100rpx;
@@ -26,13 +28,29 @@
     background-image: url("http://nosqn.colorcun.com/reserve/images/hwq.png");
 }
 .share-name{
-    margin-top: 20rpx;
-    font-size: 30rpx;
-    height: 42rpx;
-    line-height: 42rpx;
+    height: 40rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
     color: #353535;
+    line-height: 40rpx;
+    margin-top: 20rpx;
 }
 .share-item{
     min-width: 25%;
     width: 25%;
+}
+.cancel{
+    width: 100%;
+    height: 80rpx;
+    background: #F5F5F5;
+    border-radius: 40rpx;
+    text-align: center;
+    line-height: 80rpx;
+    font-size: 34rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    margin-top:60rpx;
+
 }
--- a/pages/reserve/detail.js
View file @3e2d5cc
+++ b/pages/reserve/detail.js
View file @3e2d5cc
@@ -242,4 +242,81 @@ Page({
       urls:urls
     })
   },
+  lookLocation:function(){
+    //console.log(this.data.seller.lat,this.data.seller.long,this.data.detail.map_address)
+    wx.openLocation({
+      latitude:Number(this.data.seller.lat),
+      longitude:Number(this.data.seller.long),
+      scale:17,
+      address:this.data.seller.map_address,
+      success:function (res) {
+        console.log(res)
+      }
+    })
+  },
+  sellerPhone(e){
+    this.selectComponent('#as').show(this.data.seller);
+  },
+
+  showDiscount(){
+    this.selectComponent('#discount').show()
+  },
+  discountHide(){
+    this.setData({
+      hasDisplayDiscount:false
+    })
+  },
+  discountShow(){
+    this.setData({
+      hasDisplayDiscount:true
+    })
+  },
+  reviweRoomImage(e){
+    let urls=[];
+    this.data.seller.room_image.forEach(url=>{
+      if(url){
+        urls.push(url+zdmask)
+      }
+    })
+    wx.previewImage({
+      current:util.attr(e,'current')+zdmask,
+      urls:urls
+    })
+  },
+  reviweDishesImage(e){
+    let urls=[];
+    this.data.seller.dishes.forEach(d=>{
+      if(d.image){
+        urls.push(d.image+zdmask)
+      }
+    })
+    wx.previewImage({
+      current:util.attr(e,'current')+zdmask,
+      urls:urls
+    })
+  },
+  follow(){
+    let param={
+      sid:this.options.id,
+      openid:getApp().openid,
+    }
+    if(this.data.IsCollectionSeller){//已收藏
+      param.cancel=1
+    }
+    let hasFollow=!this.data.IsCollectionSeller
+    this.setData({
+      IsCollectionSeller:hasFollow
+    })
+    App.Customer.SetCollectionRel(param);
+    PubSub.emit(
+      'follow',
+      {
+        sid:this.options.id,
+        hasFollow:hasFollow,
+      }
+    )
+  },
+  shareDisplay(){
+    this.selectComponent('#share').show()
+  },
 })
--- a/pages/reserve/detail.json
View file @3e2d5cc
+++ b/pages/reserve/detail.json
View file @3e2d5cc
@@ -9,7 +9,7 @@
     "stat":"/components/stat/stat",
     "as-phone":"/components/actionSheet/phone",
     "nav":"/components/nav/nav",
-    "discount":"/components/reserve/seller/discount",
+
     "share":"/components/reserve/share/share",
     "people":"/components/reserve/people/people",
     "dur":"/components/reserve/dur/dur",
@@ -17,10 +17,13 @@
     "activity-tips":"/components/activity/tips",
     "section":"/components/reserve/section/section",
     "select-room":"/components/reserve/select-room/select-room",
-    "service":"/components/tips/service",
+
     "taocan":"/components/2.0/taocan/lists",
     "plcard":"/components/2.0/pinglun/card",
-    "getpos":"/components/2.0/userinfo/getpos"
+    "getpos":"/components/2.0/userinfo/getpos",
+    "as-phone":"/components/2.0/dialog/phone",
+    "service":"/components/tips/service",
+    "discount":"/components/reserve/seller/discount"
   }
 }
--- a/pages/reserve/detail.wxml
View file @3e2d5cc
+++ b/pages/reserve/detail.wxml
View file @3e2d5cc
@@ -51,18 +51,19 @@
             <view class="slogan-icon view margin-lr-sm"></view>{{seller.slogan}}
         </view>
         <view class="flex justify-start align-start">
-            <view class="flex-treble">
+            <view class="flex-treble" bindtap="lookLocation">
                 <view class="text-bold text-30">{{seller.real_address||seller.map_address}}</view>
                 <view wx:if="{{seller.distanceStr}}" class="flex align-center text-666666 txt-28-h">
                     <view class="localtion view margin-right-xs"></view>
                     {{seller.distanceStr?'距您'+seller.distanceStr:''}}
                 </view>
             </view>
-            <view class="view margin-lr-sm flex flex-direction align-start justify-center">
+            <view class="view margin-lr-sm flex flex-direction align-start justify-center" bindtap="lookLocation">
                 <view class="map-icon view"></view>
                 <view class="txt-24-h text-blue">位置</view>
             </view>
-            <view class="view margin-left-sm flex flex-direction align-start justify-center">
+            <view class="view margin-left-sm flex flex-direction align-start justify-center"
+                  bindtap="sellerPhone">
                 <view class="tel-icon view"></view>
                 <view class="txt-24-h text-blue">电话</view>
             </view>
@@ -88,7 +89,7 @@
         <block wx:elif="{{seller.activityStr}}">
             <view class="view flex align-center" bindtap="showDiscount">
                 <view class="view flex flex-treble text-cut align-center">
-                    <view class="view margin-right-lg txt-32-h">优惠</view>
+                    <view class="view margin-right-lg txt-40-h text-bold">优惠</view>
                     <view class="view flex-treble text-cut">
                         {{seller.activityStr}}
                     </view>
@@ -111,7 +112,8 @@
         <view class="view padding-left-lg text-bold txt-40-h margin-bottom">参观包间</view>
         <scroll-view class="text-cut margin-bottom-sm" scroll-x="true" bindscroll="scroll" style="width: 100%;">
             <block wx:for="{{seller.room_image}}" wx:key="room_image">
-                <image class="room_image" mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
+                <image class="room_image" mode="aspectFill"
+                       bindtap="reviweRoomImage" data-current="{{item}}"
                        src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
             </block>
         </scroll-view>
@@ -189,15 +191,17 @@
                         <view class="Medium txt-20-h">首页</view>
                     </view>
                 </navigator>
-                <view class="flex flex-direction align-center justify-center">
-                    <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="http://nosqn.colorcun.com/detail/x%20%2822%29.png"></image>
+                <view class="flex flex-direction align-center justify-center" bindtap="follow">
+                    <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="{{IsCollectionSeller?'http://nosqn.colorcun.com/detail/x%20%2810%29.png':'http://nosqn.colorcun.com/detail/x%20%2822%29.png'}}"></image>
                     <view class="Medium txt-20-h">收藏</view>
                 </view>
-                <view class="flex flex-direction align-center justify-center">
-                    <image style="width:36rpx;height: 36rpx;margin-bottom: 10rpx;" src="http://nosqn.colorcun.com/detail/x%20%2821%29.png"></image>
-                    <view class="Medium txt-20-h">客服</view>
-                </view>
-                <view class="flex flex-direction align-center justify-center">
+                <service>
+                    <view class="flex flex-direction align-center justify-center">
+                        <image style="width:36rpx;height: 36rpx;margin-bottom: 10rpx;" src="http://nosqn.colorcun.com/detail/x%20%2821%29.png"></image>
+                        <view class="Medium txt-20-h">客服</view>
+                    </view>
+                </service>
+                <view class="flex flex-direction align-center justify-center" bindtap="shareDisplay">
                     <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="http://nosqn.colorcun.com/detail/x%20%2820%29.png"></image>
                     <view class="Medium txt-20-h">分享</view>
                 </view>
@@ -208,4 +212,13 @@
         </view>
     </view>
 </page>
-<getpos id="getpos" bindpos="onpos"></getpos>
+<getpos id="getpos" bindpos="onpos"></getpos>
+<as-phone id="as"></as-phone>
+<discount id="discount" seller="{{seller}}" wx:if="{{seller}}"
+          hasPTactivity="{{hasPTactivity}}"
+          cla="{{activeTab=='reserve'?'seller-reserve':''}}"
+          bindevent="reserveEvent"
+          bindhide="discountHide"
+          bindshow="discountShow"></discount>
+<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
+
--- a/pages/reserve/detail.wxss
View file @3e2d5cc
+++ b/pages/reserve/detail.wxss
View file @3e2d5cc
@@ -101,6 +101,7 @@ page{
   position: fixed;
   bottom: 0;
+  z-index: 2;
 }
 .reserve-button{
   width: 270rpx;
@@ -132,3 +133,15 @@ page{
   background: #F8F8F8;
   border-radius: 10rpx;
 }
+.commentLabel{
+  height: 52rpx;
+  background: #F1F1F1;
+  border-radius: 26rpx;
+
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 52rpx;
+  text-align: center;
+}